sms77 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36eb3f4cd708334c2bda49e4c94c7eef521de326a94231cdfe0c53e76bdee13f
-  data.tar.gz: 4ab1e7ec064ee7b3fc3bb8415fe1f8b1b23721bdb786647e88bee187bcc620ac
+  metadata.gz: 7c6d1a2a65499394f749f079241498d3a7170c67f9951aac9e8f5c73e5eeb405
+  data.tar.gz: a9e06cabf74bcb72716f429b6e0915b195bb537cd8e0aeb82abd3c7e0c411359
 SHA512:
-  metadata.gz: 0a1cfa14204af7aa47452dedbd5971f1f6d5e839651ef77fcabf94c6ebfc7995d4d78b2a5e77fa73d491bf3adf246fc32afe499919e5d9eddecc4817de6309f4
-  data.tar.gz: c7c7631464d9bdc25b84e227d00c6271d46d2ee16e710759e445e457f84e3e212de819401abfbb74d4e5f6cd1cdef338a407e857887a212d9e06923826bc6d1b
+  metadata.gz: d35e191be7c6f4cf0a5066f69cbc2cb050c382cafc039d2ecae2b39c80987380dbc100b43c2398d78897f22ded6b7304bde5063b4665385ab027df06cd784ae1
+  data.tar.gz: 2297d5c22a861bc9be2168ffb045ad448d48b2af8caedd6ef1613f95eff163117d8da20828a91623e2b762d49f603115a9b825a5b3dbe155adbabb9347aa4d17

data/README.md

@@ -3,18 +3,21 @@
 # Ruby Client for the Sms77.io SMS Gateway API
 
 ## Installation
+
 ```gem install sms77```
 
 ### Usage
+
 ```ruby
 require 'sms77'
 
-client = Sms77::Client.new(ENV['SMS77_API_KEY'])
-
-puts "Balance: #{client.balance}"
+puts Sms77::Client.new(Sms77::Resource(ENV['SMS77_API_KEY'])).Balance.retrieve
+# or
+puts Sms77::Resources::Balance.new(ENV['SMS77_API_KEY']).retrieve
 ```
 
 #### Testing
+
 ```shell
 SMS77_API_KEY=MySms77ApiKey bundle exec rspec
 ```
@@ -26,4 +29,5 @@ Setting ```SMS77_DEBUG=1``` prints details to stdout.
 Setting ```SMS77_TEST_HTTP=1``` enables live testing with actual API requests.
 
 ##### Support
+
 Need help? Feel free to send us an <a href='mailto: support@sms77.io'>email</a>.

data/lib/sms77.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'sms77/version'
-require 'sms77/client'
 
 module Sms77
 end

data/lib/sms77/client.rb

@@ -1,64 +1,29 @@
 # frozen_string_literal: true
 
-require 'cgi'
-require 'json'
-require 'faraday'
-require 'sms77/endpoint'
-require 'sms77/contacts'
-require 'sms77/base'
+require 'sms77/resources/analytics'
+require 'sms77/resources/balance'
+require 'sms77/resources/contacts'
+require 'sms77/resources/hooks'
+require 'sms77/resources/journal'
+require 'sms77/resources/lookup'
+require 'sms77/resources/pricing'
+require 'sms77/resources/sms'
+require 'sms77/resources/status'
+require 'sms77/resources/validate_for_voice'
+require 'sms77/resources/voice'
+require 'sms77/util'
 
 module Sms77
-  class Client < Sms77::Base
-    def analytics(params = {})
-      get(Sms77::Endpoint::ANALYTICS, params)
-    end
-
-    def balance
-      get(Sms77::Endpoint::BALANCE)
-    end
-
-    def contacts(params)
-      get_or_post(Sms77::Contacts::Action::READ == params[:action], Sms77::Endpoint::CONTACTS, params)
-    end
-
-    def hooks(params)
-      Sms77::Hooks::Validator::validate(params)
-
-      get_or_post(Sms77::Hooks::Action::READ == params[:action], Sms77::Endpoint::HOOKS, params)
-    end
-
-    def journal(params)
-      get(Sms77::Endpoint::JOURNAL, params)
-    end
-
-    def lookup(params)
-      post(Sms77::Endpoint::LOOKUP, params)
-    end
-
-    def pricing(params = {})
-      get(Sms77::Endpoint::PRICING, params)
-    end
-
-    def sms(params)
-      post(Sms77::Endpoint::SMS, params)
-    end
-
-    def status(params)
-      get(Sms77::Endpoint::STATUS, params)
-    end
-
-    def validate_for_voice(params)
-      post(Sms77::Endpoint::VALIDATE_FOR_VOICE, params)
-    end
-
-    def voice(params)
-      post(Sms77::Endpoint::VOICE, params)
-    end
+  class Client
+    # @param resource [Sms77::Resource]
+    def initialize(resource)
+      Sms77::Util::get_namespace_classes(Sms77::Resources).each do |cls|
+        name = cls.name.split('::').last
 
-    private
+        instance_variable_set("@#{name}", cls.new(resource))
 
-    def get_or_post(bool, *args)
-      method(bool ? :get : :post).call(*args)
+        singleton_class.instance_eval("attr_reader :#{name}")
+      end
     end
   end
 end

data/lib/sms77/hooks.rb

@@ -27,7 +27,7 @@ module Sms77::Hooks
       if Sms77::Hooks::Action::SUBSCRIBE == action
         raise 'Parameter validation failed' unless Sms77::Hooks::Validator::subscribe(params)
       elsif Sms77::Hooks::Action::UNSUBSCRIBE == action
-        raise 'ID must be a positive integer' unless Sms77::Util::is_positive_integer?(params[:id])
+        raise 'ID must be a positive integer' unless Sms77::Hooks::Validator::unsubscribe(params)
       end
     end
 
@@ -39,6 +39,10 @@ module Sms77::Hooks
         self.target_url?(params[:target_url])
     end
 
+    def self.unsubscribe(params)
+      Sms77::Util::is_positive_integer?(params[:id])
+    end
+
     def self.is_action?(str)
       Sms77::Util::in_module_constants?(str, Sms77::Hooks::Action)
     end

data/lib/sms77/{base.rb → resource.rb}

@@ -6,14 +6,10 @@ require 'faraday'
 require 'sms77/endpoint'
 
 module Sms77
-  class Base
+  class Resource
+    attr_reader :api_key, :endpoint, :sent_with, :http_methods, :request_methods, :builder, :conn
+
     BASE_PATH = '/api/'
-    CONN = Faraday.new("https://gateway.sms77.io#{BASE_PATH}")
-    HTTP_GET = CONN.method(:get).freeze
-    HTTP_POST = CONN.method(:post).freeze
-    CONN.freeze
-    HTTP_METHODS = [HTTP_GET, HTTP_POST].freeze
-    BUILDER = CONN.builder
 
     def initialize(api_key, sent_with = 'ruby')
       raise 'missing api_key in config' if api_key.to_s.empty?
@@ -21,36 +17,48 @@ module Sms77
 
       @api_key = api_key
       @sent_with = sent_with
-
-      HTTP_METHODS.each do |method|
-        define_singleton_method(method.name) { |*args| request(method, *args) }
-      end
+      @endpoint = self.class.get_endpoint
+      @http_methods = self.class.get_http_methods
+      @conn = Faraday.new("https://gateway.sms77.io#{BASE_PATH}")
     end
 
-    attr_reader :api_key, :sent_with
-
     protected
 
-    def request(method, path, payload = {})
-      if !payload.empty? && HTTP_GET == method
-        path = "#{path}?#{URI.encode_www_form(payload)}"
+    def request(payload = {}, query = {})
+      path = @endpoint
+      http_method = @http_methods[caller_locations.first.label.to_sym]
+
+      if :get == http_method
+        query = payload
 
         payload = {}
       end
 
-      method = method.name
+      query.each do |key, val|
+        query.store(key, Sms77::Util::to_numbered_bool(val))
+      end
+
+      payload.each do |key, val|
+        payload.store(key, Sms77::Util::to_numbered_bool(val))
+      end
+
+      unless query.empty?
+        path = "#{path}?#{URI.encode_www_form(query)}"
+      end
+
       headers = Hash[
         Faraday::Request::Authorization::KEY, "Bearer #{@api_key}",
         'sentWith', @sent_with
       ]
 
-      res = CONN.run_request(method, path, payload, headers)
+      res = @conn.run_request(http_method, path, payload, headers)
 
       puts JSON.pretty_generate(res.to_hash.merge({
-                                                    :method => method,
+                                                    :method => http_method,
                                                     :path => path,
                                                     :payload => payload,
-                                                    :req_headers => headers
+                                                    :req_headers => headers,
+                                                    :query => query,
                                                   }).compact) if ENV['SMS77_DEBUG']
 
       raise "Error requesting (#{self.class.name}) with code #{res.status}" unless 200 == res.status
@@ -71,5 +79,15 @@ module Sms77
 
       body
     end
+
+    class << self
+      def get_http_methods
+        @http_methods
+      end
+
+      def get_endpoint
+        @endpoint
+      end
+    end
   end
 end

data/lib/sms77/resources/analytics.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Analytics < Sms77::Resource
+    @endpoint = Sms77::Endpoint::ANALYTICS
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    def retrieve(params = {})
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/balance.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Balance < Sms77::Resource
+    @endpoint = Sms77::Endpoint::BALANCE
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    def retrieve
+      request
+    end
+  end
+end

data/lib/sms77/resources/contacts.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Contacts < Sms77::Resource
+    @endpoint = Sms77::Endpoint::CONTACTS
+    @http_methods = {
+      :delete => :post,
+      :read => :get,
+      :write => :post,
+    }
+
+    def read(params = {})
+      request(params.merge({ :action => Sms77::Contacts::Action::READ }))
+    end
+
+    def delete(params)
+      request({}, params.merge({ :action => Sms77::Contacts::Action::DEL }))
+    end
+
+    def write(params)
+      request({}, params.merge({ :action => Sms77::Contacts::Action::WRITE }))
+    end
+  end
+end

data/lib/sms77/resources/hooks.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Hooks < Sms77::Resource
+    @endpoint = Sms77::Endpoint::HOOKS
+    @http_methods = {
+      :read => :get,
+      :subscribe => :post,
+      :unsubscribe => :post,
+    }
+
+    def read(params = {})
+      request(params.merge({ :action => Sms77::Hooks::Action::READ }))
+    end
+
+    def subscribe(params)
+      Sms77::Hooks::Validator::subscribe(params)
+
+      request(params.merge({ :action => Sms77::Hooks::Action::SUBSCRIBE }))
+    end
+
+    def unsubscribe(params)
+      Sms77::Hooks::Validator::unsubscribe(params)
+
+      request(params.merge({ :action => Sms77::Hooks::Action::UNSUBSCRIBE }))
+    end
+  end
+end

data/lib/sms77/resources/journal.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Journal < Sms77::Resource
+    @endpoint = Sms77::Endpoint::JOURNAL
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    def retrieve(params)
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/lookup.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+module Sms77::Resources
+  class Lookup < Sms77::Resource
+    @endpoint = Sms77::Endpoint::LOOKUP
+    @http_methods = {
+      :cnam => :post,
+      :format => :post,
+      :hlr => :post,
+      :mnp => :post,
+    }
+
+    def cnam(params)
+      request(params.merge({ :type => Sms77::Lookup::Type::CNAM }))
+    end
+
+    def format(params)
+      request(params.merge({ :type => Sms77::Lookup::Type::FORMAT }))
+    end
+
+    def hlr(params)
+      request(params.merge({ :type => Sms77::Lookup::Type::HLR }))
+    end
+
+    def mnp(params)
+      request(params.merge({ :type => Sms77::Lookup::Type::MNP }))
+    end
+  end
+end

data/lib/sms77/resources/pricing.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Pricing < Sms77::Resource
+    @endpoint = Sms77::Endpoint::PRICING
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    def retrieve(params = {})
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/sms.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Sms < Sms77::Resource
+    @endpoint = Sms77::Endpoint::SMS
+    @http_methods = {
+      :retrieve => :post,
+    }
+
+    def retrieve(params)
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/status.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Status < Sms77::Resource
+    @endpoint = Sms77::Endpoint::STATUS
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    def retrieve(params)
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/validate_for_voice.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class ValidateForVoice < Sms77::Resource
+    @endpoint = Sms77::Endpoint::VALIDATE_FOR_VOICE
+    @http_methods = {
+      :retrieve => :post,
+    }
+
+    def retrieve(params)
+      request(params)
+    end
+  end
+end

data/lib/sms77/resources/voice.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'sms77/resource'
+
+module Sms77::Resources
+  class Voice < Sms77::Resource
+    @endpoint = Sms77::Endpoint::VOICE
+    @http_methods = {
+      :send => :post,
+    }
+
+    def send(params)
+      request(params)
+    end
+  end
+end

data/lib/sms77/util.rb

@@ -1,6 +1,24 @@
 require 'date'
 
 module Sms77::Util
+  def self.to_numbered_bool(val)
+    if true == val
+      return 1
+    elsif false == val
+      return 0
+    end
+
+    return val
+  end
+
+  def self.get_namespace_members_by_type(ns, type)
+    ns.constants.map(&ns.method(:const_get)).grep(type)
+  end
+
+  def self.get_namespace_classes(ns)
+    return self.get_namespace_members_by_type(ns, Class)
+  end
+
   def self.get_module_constant_values(mod)
     mod.constants(false).map &mod.method(:const_get)
   end

data/lib/sms77/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sms77
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/EnvKeyStore.rb

@@ -0,0 +1,15 @@
+class EnvKeyStore
+  def initialize(key)
+    @key = "SMS77_TEST_#{key}"
+
+    @store = ENV[@key]
+  end
+
+  def get(fallback = nil)
+    @store.nil? ? fallback : @store
+  end
+
+  def set(val, only_on_nil = false)
+    @store = val unless only_on_nil
+  end
+end

data/spec/matchers.rb

@@ -0,0 +1,23 @@
+RSpec::Matchers.define :be_nil_or_lengthy_string do
+  match do |val|
+    Sms77::Util::nil_or_lengthy_string?(val)
+  end
+end
+
+RSpec::Matchers.define :be_boolean do
+  match do |val|
+    Sms77::Util::boolean?(val)
+  end
+end
+
+RSpec::Matchers.define :be_numeric do
+  match do |val|
+    Sms77::Util::numeric?(val)
+  end
+end
+
+RSpec::Matchers.define :be_lengthy_string do
+  match do |val|
+    Sms77::Util::lengthy_string?(val)
+  end
+end

data/spec/sms77/balance_spec.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
+require 'sms77/resources/balance'
 
 RSpec.describe Sms77, 'balance' do
   it 'returns the account balance' do
-    expect(Helper.get(Sms77::Endpoint::BALANCE, 12.34)).to be_a(Float)
+    helper = Helper.new(Sms77::Resources::Balance)
+    balance = helper.request(helper.resource.method(:retrieve), 155.55)
+    expect(balance).to be_a(Float)
   end
 end

data/spec/sms77/client_spec.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
+require 'sms77/client'
+require 'sms77/resource'
 require 'spec_helper'
-require 'sms77/endpoint'
 
 RSpec.describe Sms77, 'client' do
-  it 'checks api key' do
-    expect(Helper.client.api_key).to be_lengthy_string
-  end
-
-  it 'checks sentWith' do
-    expect(Helper.client.sent_with).to be_lengthy_string
-  end
+  it 'should contain all resource modules' do
+    client = Sms77::Client.new(Sms77::Resource.new('x'))
 
-  it 'fails authentication' do
-    expect { Sms77::Client.new('') }.to raise_error(RuntimeError)
+    client.instance_variables.each do |var|
+      expect(Sms77::Resources.const_get(client.instance_variable_get(var).class.name)).to be_truthy
+    end
   end
 end

data/spec/sms77/contacts_spec.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
 require 'sms77/contacts'
+require 'sms77/resources/contacts'
 
 RSpec.describe Sms77, 'contacts' do
   $new_contact_id = nil
+  HELPER = Helper.new(Sms77::Resources::Contacts)
 
   def assert_new(response_body)
     if response_body.is_a?(String)
@@ -38,11 +39,6 @@ RSpec.describe Sms77, 'contacts' do
     expect(number.sub('+', '')).to be_numeric
   end
 
-  def request(action, stub, extra_params = {})
-    Helper.method(Sms77::Contacts::Action::READ == action ? :get : :post)
-          .call(Sms77::Endpoint::CONTACTS, stub, { action: action }.merge(extra_params))
-  end
-
   it 'returns all contacts as CSV' do
     stub = <<~CSV
       "4848436";"";""
@@ -55,7 +51,7 @@ RSpec.describe Sms77, 'contacts' do
       "2925186";"Tom Tester";"004901234567890"
     CSV
 
-    body = request(Sms77::Contacts::Action::READ, stub)
+    body = HELPER.request(HELPER.resource.method(:read), stub)
 
     expect(body).to be_a(String)
 
@@ -76,7 +72,7 @@ RSpec.describe Sms77, 'contacts' do
       { ID: '2925186', Name: 'Tom Tester', Number: '004901234567890' }
     ]
 
-    body = request(Sms77::Contacts::Action::READ, stub, { json: 1 })
+    body = HELPER.request(HELPER.resource.method(:read), stub, { json: true })
 
     expect(body).to be_a(Array)
 
@@ -91,7 +87,7 @@ RSpec.describe Sms77, 'contacts' do
       4868400
     TEXT
 
-    body = request(Sms77::Contacts::Action::WRITE, stub)
+    body = HELPER.request(HELPER.resource.method(:write), stub, {})
 
     expect(body).to be_a(String)
 
@@ -99,11 +95,11 @@ RSpec.describe Sms77, 'contacts' do
   end
 
   it 'deletes a contact with given ID and return code' do
-    expect(request(Sms77::Contacts::Action::DEL, 152, { id: $new_contact_id })).to be_a(Integer)
+    expect(HELPER.request(HELPER.resource.method(:delete), 152, { id: $new_contact_id })).to be_a(Integer)
   end
 
   it 'creates a contact and returns its ID as JSON' do
-    body = request(Sms77::Contacts::Action::WRITE, { id: 4868401, return: '152' }, { json: 1 })
+    body = HELPER.request(HELPER.resource.method(:write), { id: 4868401, return: '152' }, { json: true })
 
     expect(body).to be_a(Hash)
 
@@ -111,7 +107,8 @@ RSpec.describe Sms77, 'contacts' do
   end
 
   it 'deletes a contact with given ID and return code as JSON' do
-    body = request(Sms77::Contacts::Action::DEL, { return: '152' }, { id: $new_contact_id, json: 1 })
+    body = HELPER.request(
+      HELPER.resource.method(:delete), { return: '152' }, { id: $new_contact_id, json: true })
 
     expect(body).to be_a(Hash)
     expect(body[:return]).to be_a(String)

data/spec/sms77/hooks_spec.rb

@@ -3,10 +3,12 @@
 require 'securerandom'
 require 'sms77/hooks'
 require 'sms77/util'
+require 'sms77/resources/hooks'
 require 'spec_helper'
 
 RSpec.describe Sms77, 'hooks' do
   HOOK_ID = EnvKeyStore.new('HOOK_ID')
+  HELPER = Helper.new(Sms77::Resources::Hooks)
 
   def alter_action_stub
     {
@@ -15,13 +17,13 @@ RSpec.describe Sms77, 'hooks' do
     }
   end
 
-  def request(action, stub, extra_params = {})
-    res = Helper.method(Sms77::Hooks::Action::READ == action ? :get : :post)
-                .call(Sms77::Endpoint::HOOKS, stub, { action: action }.merge(extra_params))
+  def request(fn, stub, extra_params = {})
+    res = HELPER.request(fn, stub, extra_params)
 
     expect(res).to be_a(Hash)
 
     stub_keys = stub.keys
+
     res.each do |k, v|
       expect(stub_keys).to include(k)
       expect(v.class).to match(stub[:"#{k}"].class)
@@ -31,7 +33,7 @@ RSpec.describe Sms77, 'hooks' do
   end
 
   it 'returns all hooks' do
-    res = request(Sms77::Hooks::Action::READ, {
+    res = request(HELPER.resource.method(:read), {
       :code => nil,
       :hooks => [
         {
@@ -45,9 +47,16 @@ RSpec.describe Sms77, 'hooks' do
       :success => true
     })
 
+    expect(res).to include(:code, :hooks, :success)
+    expect(res[:code]).to eq(nil)
+    expect(res[:hooks]).to be_a(Array)
+    expect(res[:success]).to be_boolean
+
     res[:hooks].each do |hook|
+      expect(hook).to include(:created, :event_type, :id, :request_method, :target_url)
+
       expect(Sms77::Util::is_valid_datetime?(hook[:created])).to be
-      expect(hook[:created] =~ /^\d\d\d\d-(0?[1-9]|1[0-2])-(0?[1-9]|[12][0-9]|3[01]) (00|[0-9]|1[0-9]|2[0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/).to be
+      expect(hook[:created]).to match(/^\d\d\d\d-(0?[1-9]|1[0-2])-(0?[1-9]|[12][0-9]|3[01]) (1[0-9]|2[0-3]|0[0-9]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/)
       expect(Sms77::Hooks::Validator::event_type?(hook[:event_type])).to be
       expect(Sms77::Util::is_positive_integer?(hook[:id])).to be
       expect(Sms77::Hooks::Validator::request_method?(hook[:request_method])).to be
@@ -55,10 +64,11 @@ RSpec.describe Sms77, 'hooks' do
     end
   end
 
+=begin
   it 'subscribes' do
     stub = alter_action_stub.merge({ :id => rand(1...1000000) })
 
-    res = request(Sms77::Hooks::Action::SUBSCRIBE, stub, {
+    res = request(HELPER.resource.method(:subscribe), stub, {
       :event_type => Sms77::Hooks::EventType::NEW_INBOUND_SMS,
       :request_method => Sms77::Hooks::RequestMethod::GET,
       :target_url => "http://ruby.tld/#{SecureRandom.uuid}"
@@ -66,18 +76,18 @@ RSpec.describe Sms77, 'hooks' do
 
     expect(Sms77::Util::is_positive_integer?(res[:id])).to be
     expect(res[:id]).to be_a(Integer)
-    expect(stub[:id]).to match(res[:id]) unless Helper.is_http
+    expect(stub[:id]).to match(res[:id]) unless Helper::IS_HTTP
 
     assert_alter_response(res)
 
-    puts "Subscribed ID: #{Helper.is_http ? res[:id] : stub[:id]}"
+    puts "Subscribed ID: #{Helper::IS_HTTP ? res[:id] : stub[:id]}"
 
     HOOK_ID.set(res[:id])
   end
 
   it 'unsubscribes' do
     id = HOOK_ID.get
-    res = request(Sms77::Hooks::Action::UNSUBSCRIBE, alter_action_stub, { :id => id })
+    res = request(HELPER.resource.method(:unubscribe), alter_action_stub, { :id => id })
 
     assert_alter_response(res)
 
@@ -87,6 +97,7 @@ RSpec.describe Sms77, 'hooks' do
 
     res[:success]
   end
+=end
 
   def assert_alter_response(res)
     expect(res[:code]).to match(nil)

data/spec/sms77/instance_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'sms77/resource'
+
+RSpec.describe Sms77, 'instance' do
+  helper = Helper.new(Sms77::Resource)
+
+  it 'checks api key' do
+    expect(helper.resource.api_key).to be_lengthy_string
+  end
+
+  it 'checks sentWith' do
+    expect(helper.resource.sent_with).to be_lengthy_string
+  end
+
+  it 'fails authentication' do
+    expect { Sms77::Resource.new('') }.to raise_error(RuntimeError)
+  end
+end

data/spec/sms77/journal_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
 require 'sms77/journal'
+require 'sms77/resources/journal'
 require 'sms77/sms'
 
 RSpec.describe Sms77, 'journal' do
@@ -20,7 +20,8 @@ RSpec.describe Sms77, 'journal' do
               :to => "49170123456789",
             }]
 
-    res = Helper.get(Sms77::Endpoint::JOURNAL, stub, { type: type })
+    helper = Helper.new(Sms77::Resources::Journal)
+    res = helper.request(helper.resource.method(:retrieve), stub, { type: type })
 
     expect(res).to be_a(Array)
 

data/spec/sms77/lookup_spec.rb

@@ -3,11 +3,16 @@
 require 'spec_helper'
 require 'sms77/endpoint'
 require 'sms77/lookup'
+require 'sms77/resources/lookup'
 require 'json'
 
 RSpec.describe Sms77, 'lookup' do
   def request(type, stub, extra_args = {})
-    Helper.post(Sms77::Endpoint::LOOKUP, stub, { type: type, number: '+491771783130' }.merge(extra_args))
+    helper = Helper.new(Sms77::Resources::Lookup)
+    helper.request(
+      helper.resource.method(type),
+      stub,
+      { number: '+491771783130' }.merge(extra_args))
   end
 
   it 'misses number to lookup' do

data/spec/sms77/pricing_spec.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'json'
+require 'sms77/resources/pricing'
 
 RSpec.describe Sms77, 'pricing' do
   it 'returns all countries pricing as json' do
@@ -36,7 +35,8 @@ RSpec.describe Sms77, 'pricing' do
       ]
     }
 
-    res = Helper.get(Sms77::Endpoint::PRICING, stub)
+    helper = Helper.new(Sms77::Resources::Pricing)
+    res = helper.request(helper.resource.method(:retrieve), stub)
     countries = res[:countries]
 
     expect(res).to be_a(Hash)

data/spec/sms77/sms_spec.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'sms77/contacts'
+require 'sms77/resources/sms'
 
 RSpec.describe Sms77, 'sms' do
   $text = 'Your glasses are ready for pickup.'
@@ -23,12 +22,13 @@ 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.post(Sms77::Endpoint::SMS, stub, params)
+    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

data/spec/sms77/validate_for_voice_spec.rb

@@ -1,17 +1,17 @@
 # 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.post(Sms77::Endpoint::VALIDATE_FOR_VOICE, stub, { number: number, callback: callback })
+    helper = Helper.new(Sms77::Resources::ValidateForVoice)
+    body = helper.request(helper.resource.method(:retrieve), stub, { number: number, callback: callback })
 
     expect(body).to be_a(Hash)
     expect(body[:success]).to be_boolean

data/spec/sms77/voice_spec.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'sms77/endpoint'
-require 'sms77/contacts'
+require 'sms77/resources/voice'
 
 RSpec.describe Sms77, 'voice' do
   def assert_response(response)
@@ -23,16 +22,17 @@ RSpec.describe Sms77, 'voice' do
     TEXT
 
     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.post(Sms77::Endpoint::VOICE, stub, params)
+    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
@@ -46,6 +46,6 @@ RSpec.describe Sms77, 'voice' do
       </Response>
     XML
 
-    assert_response(request(text, { xml: 1 }))
+    request(text, { xml: true })
   end
 end

data/spec/spec_helper.rb

@@ -3,66 +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_nil_or_lengthy_string do
-  match do |val|
-    Sms77::Util::nil_or_lengthy_string?(val)
-  end
-end
+SMS77_TEST_HTTP = (ENV['SMS77_TEST_HTTP'].nil? ? false : true).freeze
 
-RSpec::Matchers.define :be_boolean do
-  match do |val|
-    Sms77::Util::boolean?(val)
+RSpec.configure do |config|
+  SMS77_TEST_HTTP && config.after do
+    sleep(1.125)
   end
 end
 
-RSpec::Matchers.define :be_numeric do
-  match do |val|
-    Sms77::Util::numeric?(val)
-  end
-end
-
-RSpec::Matchers.define :be_lengthy_string do
-  match do |val|
-    Sms77::Util::lengthy_string?(val)
-  end
-end
+class Helper
+  attr_reader :resource
 
-class EnvKeyStore
-  def initialize(key)
-    @key = "SMS77_TEST_#{key}"
+  IS_HTTP = SMS77_TEST_HTTP
+  VIRTUAL_INBOUNDS = {
+    eplus: '+491771783130',
+  }.freeze
 
-    @store = ENV[@key]
-  end
+  # @param resource [Class<Sms77::Resource>]
+  def initialize(resource)
+    @resource = resource.new(ENV['SMS77_DUMMY_API_KEY'], 'ruby-test')
 
-  def get(fallback = nil)
-    @store.nil? ? fallback : @store
+    unless Helper::IS_HTTP
+      @stubs = Faraday::Adapter::Test::Stubs.new
+      @resource.conn.builder.adapter(:test, @stubs)
+    end
   end
 
-  def set(val, only_on_nil = false)
-    @store = val unless only_on_nil
-  end
-end
+  def create_stub(fn_name, stub)
+    http_fn = @resource.http_methods[fn_name]
+    puts "creating stub for #{http_fn} @ #{@resource.class.name}.#{fn_name}"
 
-class Helper
-  @client = Sms77::Client.new(ENV['SMS77_DUMMY_API_KEY'], 'ruby-test')
-  @is_http = ENV['SMS77_TEST_HTTP'].freeze
-  @stubs = Faraday::Adapter::Test::Stubs.new
-  @virtual_inbound_nr_eplus = '+491771783130'
-  Sms77::Client::BUILDER.adapter(:test, @stubs) unless @is_http
+    @stubs.method(http_fn).call(Sms77::Resource::BASE_PATH + @resource.endpoint) do
+      puts "stub: " + stub.inspect
 
-  Sms77::Client::HTTP_METHODS.each do |method|
-    self.class.define_method(method.name) { |*args| request(@stubs.method(method.name.to_sym), *args) }
+      [200, {}, stub]
+    end
   end
 
-  def self.request(method, endpoint, stub, params = nil)
-    method.call(Sms77::Client::BASE_PATH + endpoint) { || [200, {}, stub] } unless @is_http
-
-    @client.method(endpoint).call(*[params].compact)
-  end
+  def request(fn, stub, params = nil)
+    create_stub(fn.name, stub) unless Helper::IS_HTTP
 
-  class << self
-    attr_reader :is_http, :virtual_inbound_nr_eplus, :client
+    fn.call(*[params].compact)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms77
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - sms77 e.K.
@@ -78,21 +78,35 @@ files:
 - README.md
 - Rakefile
 - lib/sms77.rb
-- lib/sms77/base.rb
 - lib/sms77/client.rb
 - lib/sms77/contacts.rb
 - lib/sms77/endpoint.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
 - 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/hooks_spec.rb
+- spec/sms77/instance_spec.rb
 - spec/sms77/journal_spec.rb
 - spec/sms77/lookup_spec.rb
 - spec/sms77/pricing_spec.rb
@@ -125,8 +139,10 @@ signing_key:
 specification_version: 4
 summary: Official API Client for the Sms77.io SMS Gateway
 test_files:
+- spec/EnvKeyStore.rb
 - spec/spec_helper.rb
 - spec/sms77_spec.rb
+- spec/matchers.rb
 - spec/sms77/voice_spec.rb
 - spec/sms77/client_spec.rb
 - spec/sms77/lookup_spec.rb
@@ -137,3 +153,4 @@ test_files:
 - spec/sms77/balance_spec.rb
 - spec/sms77/validate_for_voice_spec.rb
 - spec/sms77/journal_spec.rb
+- spec/sms77/instance_spec.rb