sms77 0.0.1 → 0.4.0

data/spec/sms77/sms_spec.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'sms77/contacts_action'
+require 'sms77/resources/sms'
 
 RSpec.describe Sms77, 'sms' do
   $text = 'Your glasses are ready for pickup.'
@@ -23,16 +22,17 @@ RSpec.describe Sms77, 'sms' do
 
   def request(stub, extra_params = {})
     params = {
-      from: Helper.virtual_inbound_nr_eplus,
+      from: Helper::VIRTUAL_INBOUNDS[:eplus],
       text: $text,
-      to: Helper.virtual_inbound_nr_eplus
+      to: Helper::VIRTUAL_INBOUNDS[:eplus]
     }.merge(extra_params)
 
-    Helper.request(Sms77::Endpoint::SMS, params, stub)
+    helper = Helper.new(Sms77::Resources::Sms)
+    helper.request(helper.resource.method(:retrieve), stub, params)
   end
 
   it 'sends a single sms and returns success code' do
-    expect(request(100)).to be_kind_of(Integer)
+    expect(request(100)).to be_a(Integer)
   end
 
   it 'sends a single sms and returns detailed text response' do
@@ -51,14 +51,14 @@ RSpec.describe Sms77, 'sms' do
 
     body = request(stub, { details: 1 })
 
-    expect(body).to be_kind_of(String)
+    expect(body).to be_a(String)
 
     code, booked, cost, balance, text, type, flash, encoding, gsm0338, debug = body.split("\n")
 
-    expect(code).to be_kind_of(String)
-    expect(booked.split(':').last.to_f).to be_kind_of(Float)
-    expect(cost.split(':').last.to_f).to be_kind_of(Float)
-    expect(balance.split(':').last.to_f).to be_kind_of(Float)
+    expect(code).to be_a(String)
+    expect(booked.split(':').last.to_f).to be_a(Float)
+    expect(cost.split(':').last.to_f).to be_a(Float)
+    expect(balance.split(':').last.to_f).to be_a(Float)
     expect(text.split(':').last.strip!).to eq($text)
     expect(type.split(':').last.strip!).to eq('direct')
     expect(flash.split(':').last.strip!).to eq('false')
@@ -88,16 +88,16 @@ RSpec.describe Sms77, 'sms' do
 
     body = request(stub, { json: 1 })
 
-    expect(body).to be_kind_of(Hash)
+    expect(body).to be_a(Hash)
 
-    expect(body['success']).to be_kind_of(String)
-    expect(body['total_price']).to be_numeric
-    expect(body['balance']).to be_kind_of(Float)
-    expect(body['debug']).to be_kind_of(String)
-    expect(body['sms_type']).to eq('direct')
-    expect(body['messages']).to be_kind_of(Array)
-    body['messages'].each do |message|
-      expect(message).to be_kind_of(Hash)
+    expect(body[:success]).to be_a(String)
+    expect(body[:total_price]).to be_numeric
+    expect(body[:balance]).to be_a(Float)
+    expect(body[:debug]).to be_a(String)
+    expect(body[:sms_type]).to eq('direct')
+    expect(body[:messages]).to be_a(Array)
+    body[:messages].each do |message|
+      expect(message).to be_a(Hash)
     end
   end
 end

data/spec/sms77/validate_for_voice_spec.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'json'
+require 'sms77/resources/validate_for_voice'
 
 RSpec.describe Sms77, 'validate_for_voice' do
   it 'returns caller id information' do
     number = '491771783130'
-    callback_host = Helper.is_http ? `curl http://ipecho.net/plain` : '127.0.0.1'
+    callback_host = Helper::IS_HTTP ? `curl http://ipecho.net/plain` : '127.0.0.1'
     callback = "#{callback_host}/callback.php"
     stub = { success: true }
 
-    body = Helper.request(Sms77::Endpoint::VALIDATE_FOR_VOICE, { number: number, callback: callback }, stub)
+    helper = Helper.new(Sms77::Resources::ValidateForVoice)
+    body = helper.request(helper.resource.method(:retrieve), stub, { number: number, callback: callback })
 
-    expect(body).to be_kind_of(Hash)
-    expect(body['success']).to be_boolean
+    expect(body).to be_a(Hash)
+    expect(body[:success]).to be_boolean
   end
 end

data/spec/sms77/voice_spec.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'sms77/contacts_action'
+require 'sms77/resources/voice'
 
 RSpec.describe Sms77, 'voice' do
   def assert_response(response)
-    expect(response).to be_kind_of(String)
+    expect(response).to be_a(String)
 
     code, id, cost = response.split("\n")
 
@@ -22,14 +21,18 @@ RSpec.describe Sms77, 'voice' do
       0.1
     TEXT
 
-    params = { to: Helper.virtual_inbound_nr_eplus, text: text, from: Helper.virtual_inbound_nr_eplus }
-               .merge(extra_params)
+    params = {
+      from: Helper::VIRTUAL_INBOUNDS[:eplus],
+      text: text,
+      to: Helper::VIRTUAL_INBOUNDS[:eplus]
+    }.merge(extra_params)
 
-    Helper.request(Sms77::Endpoint::VOICE, params, stub)
+    helper = Helper.new(Sms77::Resources::Voice)
+    assert_response(helper.request(helper.resource.method(:send), stub, params))
   end
 
   it 'calls a number with text input' do
-    assert_response(request('Your glasses are ready for pickup.'))
+    request('Your glasses are ready for pickup.')
   end
 
   it 'calls a number with xml input' do
@@ -43,6 +46,6 @@ RSpec.describe Sms77, 'voice' do
       </Response>
     XML
 
-    assert_response(request(text, { xml: 1 }))
+    request(text, { xml: true })
   end
 end

data/spec/sms77_spec.rb

@@ -1,15 +1,7 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Sms77 do
   it 'has a version number' do
     expect(Sms77::VERSION).not_to be nil
   end
-
-  context 'failing authentication' do
-    it 'balance' do
-      expect { Sms77::Client.new('NotExistingApiKey', nil) }.to raise_error(RuntimeError)
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -3,54 +3,51 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'sms77'
+require 'sms77/resource'
+require 'sms77/util'
+require 'matchers'
+require 'EnvKeyStore'
 
-RSpec::Matchers.define :be_boolean do
-  match do |value|
-    [true, false].include? value
-  end
-end
+SMS77_TEST_HTTP = (ENV['SMS77_TEST_HTTP'].nil? ? false : true).freeze
 
-RSpec::Matchers.define :be_numeric do
-  match do |value|
-    return true if value.is_a?(Integer)
-
-    value.scan(/\D/).empty?
+RSpec.configure do |config|
+  SMS77_TEST_HTTP && config.after do
+    sleep(1.125)
   end
 end
 
 class Helper
-  @is_http = ENV.key?('TEST_HTTP')
-  @stubs = Faraday::Adapter::Test::Stubs.new
-  @conn = Faraday.new(Sms77::Client::BASE_URI) do |b|
-    b.adapter(:test, @stubs) unless @is_http
-  end
-  @client = Sms77::Client.new(ENV['SMS77_DUMMY_API_KEY'], @conn, 'ruby-test')
-  @virtual_inbound_nr_eplus = '+491771783130'
+  attr_reader :resource
 
-  def self.request(endpoint, params, stub, extra_params = {})
-    path = "#{Sms77::Client::API_SUFFIX}#{endpoint}"
+  IS_HTTP = SMS77_TEST_HTTP
+  VIRTUAL_INBOUNDS = {
+    eplus: '+491771783130',
+  }.freeze
 
-    # TODO-START: determine request method to avoid multiple useless stubs
-    @stubs.get(path) { |_env| [200, {}, JSON.generate(stub)] } unless @is_http
-    @stubs.post(path) { |_env| [200, {}, JSON.generate(stub)] } unless @is_http
-    # TODO-END
+  # @param resource [Class<Sms77::Resource>]
+  def initialize(resource)
+    @resource = resource.new(ENV['SMS77_DUMMY_API_KEY'], 'ruby-test')
 
-    response = @client.method(endpoint).call(params.merge(extra_params))
+    unless Helper::IS_HTTP
+      @stubs = Faraday::Adapter::Test::Stubs.new
+      @resource.conn.builder.adapter(:test, @stubs)
+    end
+  end
 
-    raise 'unexpected response' unless Faraday::Response == response.class
+  def create_stub(fn_name, stub)
+    http_fn = @resource.http_methods[fn_name]
+    puts "creating stub for #{http_fn} @ #{@resource.class.name}.#{fn_name}"
 
-    body = response.body
+    @stubs.method(http_fn).call(Sms77::Resource::BASE_PATH + @resource.endpoint) do
+      puts "stub: " + stub.inspect
 
-    begin
-      body = JSON.parse(body)
-    rescue StandardError
-      # Ignored
+      [200, {}, stub]
     end
-
-    body
   end
 
-  class << self
-    attr_reader :is_http, :stubs, :conn, :client, :virtual_inbound_nr_eplus
+  def request(fn, stub, params = nil)
+    create_stub(fn.name, stub) unless Helper::IS_HTTP
+
+    fn.call(*[params].compact)
   end
 end

metadata

@@ -1,74 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: sms77
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.4.0
 platform: ruby
 authors:
 - sms77 e.K.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
+        version: '2.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
 description: Send SMS & Text2Voice messages via the Sms77.io SMS Gateway.
-email:
-- support@sms77.io
+email: support@sms77.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,15 +79,36 @@ files:
 - Rakefile
 - lib/sms77.rb
 - lib/sms77/client.rb
-- lib/sms77/contacts_action.rb
+- lib/sms77/contacts.rb
 - lib/sms77/endpoint.rb
-- lib/sms77/header.rb
-- lib/sms77/lookup_type.rb
+- lib/sms77/hooks.rb
+- lib/sms77/journal.rb
+- lib/sms77/lookup.rb
+- lib/sms77/resource.rb
+- lib/sms77/resources/analytics.rb
+- lib/sms77/resources/balance.rb
+- lib/sms77/resources/contacts.rb
+- lib/sms77/resources/hooks.rb
+- lib/sms77/resources/journal.rb
+- lib/sms77/resources/lookup.rb
+- lib/sms77/resources/pricing.rb
+- lib/sms77/resources/sms.rb
+- lib/sms77/resources/status.rb
+- lib/sms77/resources/validate_for_voice.rb
+- lib/sms77/resources/voice.rb
+- lib/sms77/sms.rb
+- lib/sms77/util.rb
 - lib/sms77/version.rb
+- release.sh
 - sms77.gemspec
+- spec/EnvKeyStore.rb
+- spec/matchers.rb
 - spec/sms77/balance_spec.rb
+- spec/sms77/client_spec.rb
 - spec/sms77/contacts_spec.rb
-- spec/sms77/http_spec.rb
+- spec/sms77/hooks_spec.rb
+- spec/sms77/instance_spec.rb
+- spec/sms77/journal_spec.rb
 - spec/sms77/lookup_spec.rb
 - spec/sms77/pricing_spec.rb
 - spec/sms77/sms_spec.rb
@@ -108,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.5
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,5 +138,20 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Official Sms77.io API Client for Ruby
-test_files: []
+summary: Official API Client for the Sms77.io SMS Gateway
+test_files:
+- spec/matchers.rb
+- spec/sms77_spec.rb
+- spec/sms77/balance_spec.rb
+- spec/sms77/lookup_spec.rb
+- spec/sms77/instance_spec.rb
+- spec/sms77/voice_spec.rb
+- spec/sms77/journal_spec.rb
+- spec/sms77/validate_for_voice_spec.rb
+- spec/sms77/contacts_spec.rb
+- spec/sms77/hooks_spec.rb
+- spec/sms77/sms_spec.rb
+- spec/sms77/client_spec.rb
+- spec/sms77/pricing_spec.rb
+- spec/spec_helper.rb
+- spec/EnvKeyStore.rb

data/lib/sms77/header.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Sms77
-  module Header
-    CONTENT_TYPE = 'Content-Type'
-  end
-end

data/spec/sms77/http_spec.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'logger'
-
-describe Sms77::Http do
-  before(:all) do
-  end
-
-  after(:all) do
-  end
-
-  after(:each) do
-  end
-
-  let(:config) do
-    Helper.config
-  end
-
-  let(:logger) do
-    Logger.new($stderr).tap do |logger|
-      logger.level = Logger::ERROR
-    end
-  end
-
-  let(:instance) do
-    described_class.new(config, logger)
-  end
-
-  context 'GET' do
-    it 'performs GET requests' do
-      Helper.maybe_stub_balance(:get)
-
-      response = instance.get(url: 'balance')
-      puts response.body
-
-      expect(response.body.to_f).to be_kind_of(Float)
-    end
-  end
-end