action-texter 0.0.1 → 0.1.2.ALPHA

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8dfd865343beb264241472cba4b659104168417
-  data.tar.gz: 3e21b57d2ada99c9d2036c21064e4018ebf1fd34
+  metadata.gz: 45e843e360fc7a106fd3dfe21bb8610a2c5ed871
+  data.tar.gz: d28db3155f8faceb11f91c8b9495400adf2785e7
 SHA512:
-  metadata.gz: 4ea82f29f05c3d950e1c84152cab0488f3608946bfb4f7ef3f766865d2dfb9a4b7d67189ece689c15d441c9c7dce0cb05e349926dfa2dbe2804dc0956ed73b70
-  data.tar.gz: 9483e2ffd969de4c3316fc7b7526778a8f3eb2c74cc64e624df1f3bf70732ec29ef5149d2c2a39bc40f03631cbb888480f15f42fb257b39fa64f338f05870f79
+  metadata.gz: e00fde1bd22e3d68d28701faae5eeb4e46b330114a9cb66340c2141b23d2588e35eb9351831de9dc0689ea0e12b0d900e95473b8417888a471d44753017fa302
+  data.tar.gz: 2924abaedaba3c1020e41b0c819494d0404765238564c024fc0e4eb1951dba018d5239aa6851fa9caa907fd984a4da870925f70494b8fc82c2e84260d702c808

data/.gitignore

@@ -33,3 +33,4 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+example.rb

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'tins', '1.5.4', require: false, group: :test
 gem 'simplecov', require: false, group: :test
 gem 'coveralls', require: false, group: :test
+gem 'pry'

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    action-texter (0.0.1)
+    action-texter (0.1.2.ALPHA)
+      class_attribute (~> 0.1)
+      facets (~> 3.0)
       json
-      phony (~> 2.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
+    class_attribute (0.1.3)
+    coderay (1.1.0)
     coveralls (0.8.5)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -21,13 +24,18 @@ GEM
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
+    facets (3.0.0)
     hashdiff (0.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.3)
+    method_source (0.8.2)
     mime-types (2.99)
     netrc (0.11.0)
-    phony (2.15.9)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -52,6 +60,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -71,6 +80,7 @@ DEPENDENCIES
   action-texter!
   bundler (~> 1.10)
   coveralls
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   simplecov

data/action-texter.gemspec

@@ -23,12 +23,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 1.0'
+  spec.add_development_dependency 'pry'
 
   if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-    spec.add_runtime_dependency 'phony', '~> 2.12'
+
     spec.add_runtime_dependency 'json'
+    spec.add_runtime_dependency 'facets', '~> 3.0'
+    spec.add_runtime_dependency 'class_attribute', '~> 0.1'
   else
-    spec.add_dependency 'phony', '~> 2.15'
+    spec.add_runtime_dependency 'facets', '~> 3.0'
     spec.add_dependency 'json'
   end
 end

data/lib/action_texter.rb

@@ -1,13 +1,29 @@
 require 'action_texter/configuration'
-
+require 'pry'
 module ActionTexter
+  
   autoload :Messenger, 'action_texter/messenger'
   autoload :Message, 'action_texter/message'
   autoload :Request, 'action_texter/request'
   autoload :Helper, 'action_texter/helper'
   autoload :MessageDelivery, 'action_texter/message_delivery'
+  autoload :DeliveryMethods, 'action_texter/delivery_methods'
+
+  module Provider
+    module Messagebird
+      autoload :Delivery, 'action_texter/provider/messagebird/delivery'
+      autoload :Response, 'action_texter/provider/messagebird/response'
+      autoload :ErrorResponse, 'action_texter/provider/messagebird/response_error'
+      autoload :SuccessMessagebird, 'action_texter/provider/messagebird/response_success'
+    end
+
+    module TestMessage
+      autoload :Delivery, 'action_texter/provider/test_message/delivery'
+    end
+  end
 
   class << self
+    
     def configure
       yield(configuration)
     end
@@ -17,5 +33,6 @@ module ActionTexter
     end
 
     alias_method :config, :configuration
+  
   end
 end

data/lib/action_texter/configuration.rb

@@ -1,6 +1,6 @@
 module ActionTexter
   class Configuration
-    attr_accessor :from, :to, :endpoint, :path, :product_token, :content_type
+    attr_accessor :from, :to, :endpoint, :path, :product_token, :content_type, :delivery_method
 
     alias_method :api_key=, :product_token=
 
@@ -12,6 +12,7 @@ module ActionTexter
       @endpoint = 'https://rest.sms-service.com'
       @path = '/messages'
       @content_type = 'application/json'
+      @delivery_method = :test
     end
   end
 end

data/lib/action_texter/delivery_methods.rb

@@ -0,0 +1,80 @@
+require 'forwardable'
+require 'facets/module/cattr'
+require 'class_attribute'
+
+module ActionTexter
+  # This module handles everything related to mail delivery, from registering new
+  # delivery methods to configuring the mail object to be sent.
+  module DeliveryMethods
+    def self.included(base)
+      base.extend ClassMethods
+      base.include ClassAttribute
+      base.class_eval do
+        # Do not make this inheritable, because we always want it to propagate
+        cattr_accessor :raise_delivery_errors
+        self.raise_delivery_errors = true
+
+        cattr_accessor :perform_deliveries
+        self.perform_deliveries = true
+
+        self.delivery_methods = {}.freeze
+
+        # add_delivery_method :file, ActionTexter::FileDelivery,
+        #:location => defined?(Rails.root) ? "#{Rails.root}/tmp/texts" : "#{Dir.tmpdir}/texts"
+        add_delivery_method :test, ActionTexter::Provider::TestMessage::Delivery
+        add_delivery_method :messagebird, ActionTexter::Provider::Messagebird::Delivery, { endpoint: 'https://rest.messagebird.com', path: '/messages' }
+        # add_delivery_method :twilio, ActionTexter::TwilioDelivery
+        # add_delivery_method :whitelist_proxy, ActionTexter::WhitelistProxyDelivery
+      end
+    end
+
+    module ClassMethods
+      extend Forwardable
+      cattr_accessor :delivery_methods, :delivery_method
+      # attr_accessor
+      # Provides a list of SMS messages that have been delivered by ActionTexter::TestDelivery
+      delegate deliveries: ActionTexter::Provider::TestMessage::Delivery
+      delegate :deliveries= => ActionTexter::Provider::TestMessage::Delivery
+
+      # Adds a new delivery method through the given class using the given symbol
+      # as alias and the default options supplied:
+      #
+      # Example:
+      #
+      #   add_delivery_method :sendmail, Mail::Sendmail,
+      #     :location   => '/usr/sbin/sendmail',
+      #     :arguments  => '-i -t'
+      #
+      def add_delivery_method(symbol, klass, default_options = {})
+        class_attribute(:"#{symbol}_settings") unless respond_to?(:"#{symbol}_settings")
+        send(:"#{symbol}_settings=", default_options)
+        self.delivery_methods = delivery_methods.merge(symbol.to_sym => klass).freeze
+      end
+
+      def wrap_delivery_behavior(message, method = nil) #:nodoc:
+        method ||= delivery_method
+        message.delivery_handler = self
+
+        case method
+        when NilClass
+          fail 'Delivery method cannot be nil'
+        when Symbol
+          if klass = delivery_methods[method.to_sym]
+            message.delivery_method(klass, send(:"#{method}_settings"))
+          else
+            fail "Invalid delivery method #{method.inspect}"
+          end
+        else
+          message.delivery_method(method)
+        end
+
+        message.perform_deliveries    = perform_deliveries
+        message.raise_delivery_errors = raise_delivery_errors
+      end
+    end
+
+    def wrap_delivery_behavior!(*args) #:nodoc:
+      self.class.wrap_delivery_behavior(*args)
+    end
+  end
+end

data/lib/action_texter/gem_version.rb

@@ -6,9 +6,9 @@ module ActionTexter
 
   module VERSION
     MAJOR = 0
-    MINOR = 0
-    TINY  = 1
-    PRE   = nil
+    MINOR = 1
+    TINY  = 2
+    PRE   = 'ALPHA'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_texter/message.rb

@@ -1,38 +1,33 @@
-require 'phony'
-require 'action_texter/request'
-require 'action_texter/validator/message'
 
 module ActionTexter
   class Message
-    attr_accessor :from, :to, :body, :reference
+    include DeliveryMethods
+    attr_accessor :from, :to, :body, :reference, :delivery_handler
+    attr_reader :delivery_method, :delivery_options
 
     def initialize(attributes = {})
       @from          = attributes[:from]
       @to            = attributes[:to]
       @body          = attributes[:body]
       @reference     = attributes[:reference]
-    end
-
-    def request
-      Request.new(to_json)
+      wrap_delivery_behavior!(self, ActionTexter.config.delivery_method)
     end
 
     def deliver
-      request.perform if valid?
+      @delivery_method.deliver(self)
+      # request.perform if valid?
     end
 
     def deliver!
-      deliver if valid?
-    end
-
-    def valid?
-      ActionTexter::Validator::Message.new self
+      deliver
     end
 
-    def to_json
-      JSON.generate(recipients: to,
-                    originator: from,
-                    body: body)
+    def delivery_method(method = nil, opts = {})
+      unless method
+        @delivery_method
+      else
+        @delivery_method = method.new(opts)
+      end
     end
   end
 end

data/lib/action_texter/provider/messagebird/delivery.rb

@@ -0,0 +1,31 @@
+require 'json'
+module ActionTexter
+  module Provider
+    module Messagebird
+      class Delivery
+        attr_accessor :body
+        attr_reader :response
+
+        def initialize(settings)
+          @endpoint = settings[:endpoint]
+          @path = settings[:path]
+        end
+
+        def deliver message
+          binding.pry
+          uri = URI.parse( @endpoint )
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+            @response = Response.new(http.post(@path, to_json(message), 'Authorization' => "AccessKey #{ActionTexter.config.product_token}", 'Content-Type' => 'application/json'))
+          end
+          response
+        end
+
+        def to_json message
+            JSON.generate(recipients: message.to,
+                          originator: message.from,
+                          body: message.body)
+        end
+      end
+    end
+  end
+end

data/lib/action_texter/provider/messagebird/response.rb

@@ -0,0 +1,33 @@
+module ActionTexter
+  module Provider
+    module Messagebird
+      
+      class Response
+        attr_reader :net_http_response, :body, :code
+
+        def initialize(net_http_response)
+          @net_http_response = net_http_response
+          @body              = @net_http_response.body
+          @code              = @net_http_response.code
+        end
+
+        def success?
+          code.to_i == 201
+        end
+
+        def failure?
+          !success?
+        end
+
+        def body
+          if success?
+            SuccessResponse.new(@body)
+          else
+            ErrorResponse.new(@body)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/action_texter/provider/messagebird/response_error.rb

@@ -0,0 +1,33 @@
+require 'json'
+module ActionTexter
+  module Provider
+    module Messagebird
+      class ErrorResponse
+
+        attr_reader :code, :description
+
+        ERROR_CODES = {
+          2 => 'Request not allowed',
+          9 => 'Missing params',
+          10 => 'Invalid params',
+          20 => 'Not found',
+          25 => 'Not enough balance',
+          98 => 'API not found',
+          99 => 'Internal error'
+        }
+
+        def initialize(error)
+          @errors = JSON.parse(error, symbolize_names: true)[:errors]
+        end
+
+        def errors
+          @errors.map { |e| e.merge(error_message: ERROR_CODES[e[:code]]) }
+        end
+
+        def count
+          @errors.count
+        end
+      end
+    end
+  end
+end

data/lib/action_texter/provider/messagebird/response_success.rb

@@ -0,0 +1,75 @@
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable MethodLength
+require 'json'
+module MessagebirdTexter
+  class Response
+    class Body
+      attr_reader :id,
+                  :href,
+                  :direction,
+                  :type,
+                  :originator,
+                  :content,
+                  :reference,
+                  :validity,
+                  :gateway,
+                  :datacoding,
+                  :mclass,
+                  :scheduled_datetime,
+                  :created_datetime,
+                  :recipients
+
+      def initialize(body)
+        parsed_body         = JSON.parse(body, symbolize_names: true)
+        @id                 = parsed_body[:id]
+        @href               = parsed_body[:href]
+        @direction          = parsed_body[:direction]
+        @type               = parsed_body[:type]
+        @originator         = parsed_body[:originator]
+        @content            = parsed_body[:body]
+        @reference          = parsed_body[:reference]
+        @validity           = parsed_body[:validity]
+        @gateway            = parsed_body[:gateway]
+        @datacoding         = parsed_body[:datacoding]
+        @mclass             = parsed_body[:mclass]
+        @scheduled_datetime = parsed_body[:scheduledDatetime]
+        @created_datetime   = parsed_body[:createdDatetime]
+        @recipients         = parsed_body[:recipients]
+      end
+
+      def scheduled_datetime
+        Date.parse(@scheduled_datetime) unless @scheduled_datetime.nil?
+      end
+
+      def created_datetime
+        Date.parse(@created_datetime) unless @created_datetime.nil?
+      end
+
+      def recipients
+        OpenStruct.new(
+          total_count: @recipients[:totalCount],
+          total_sent_count: @recipients[:totalSentCount],
+          total_delivered_count: @recipients[:totalDeliveredCount],
+          items: items
+
+        ) unless @recipients.nil?
+      end
+
+      private
+
+      def items
+        @recipients[:items].map do |i|
+          OpenStruct.new(item(i))
+        end
+      end
+
+      def item(item)
+        {
+          recipient: item[:recipient],
+          status: item[:status],
+          status_datetime: Date.parse(item[:statusDatetime])
+        }
+      end
+    end
+  end
+end

data/lib/action_texter/provider/test_message/delivery.rb

@@ -0,0 +1,24 @@
+require 'class_attribute'
+module ActionTexter
+  module Provider
+    module TestMessage
+      class Delivery
+        include ClassAttribute
+        cattr_accessor :deliveries
+        self.deliveries = []
+
+        def initialize(config = {})
+        end
+
+        def deliver(message)
+          self.class.deliveries << message
+          deliveries
+        end
+
+        def truncate
+          self.class.deliveries = []
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action-texter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.2.ALPHA
 platform: ruby
 authors:
 - oliverzeyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: phony
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: class_attribute
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Send text messages by means of the HTTP protocol via a HTTP driven sms
   provider
 email:
@@ -117,15 +145,19 @@ files:
 - bin/setup
 - lib/action_texter.rb
 - lib/action_texter/configuration.rb
+- lib/action_texter/delivery_methods.rb
 - lib/action_texter/gem_version.rb
 - lib/action_texter/helper.rb
 - lib/action_texter/message.rb
 - lib/action_texter/message_delivery.rb
 - lib/action_texter/messenger.rb
+- lib/action_texter/provider/messagebird/delivery.rb
+- lib/action_texter/provider/messagebird/response.rb
+- lib/action_texter/provider/messagebird/response_error.rb
+- lib/action_texter/provider/messagebird/response_success.rb
+- lib/action_texter/provider/test_message/delivery.rb
 - lib/action_texter/request.rb
 - lib/action_texter/response.rb
-- lib/action_texter/validator/message.rb
-- lib/action_texter/validator/request.rb
 - lib/action_texter/version.rb
 homepage: https://github.com/HitFox/action-texter
 licenses:
@@ -142,9 +174,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/lib/action_texter/validator/message.rb

@@ -1,53 +0,0 @@
-module ActionTexter
-  module Validator
-    class Message
-      class FromTooLong < ArgumentError; end
-      class FromMissing < ArgumentError; end
-      class ToMissing < ArgumentError; end
-      class BodyMissing < ArgumentError; end
-      class BodyTooLong < ArgumentError; end
-      class ToUnplausible < ArgumentError; end
-
-      attr_reader :message
-
-      def initialize(message)
-        @message = message
-
-        fail FromMissing, 'The value for the from attribute is missing.' unless sender_present?
-        fail FromTooLong, 'The value for the sender attribute must contain 1..11 characters.' unless sender_length?
-        fail ToMissing, 'The value for the to attribute is missing.' unless receiver_present?
-        fail BodyMissing, 'The body of the message is missing.' unless body_present?
-        fail BodyTooLong, 'The body of the message has a length greater than 160.' unless body_correct_length?
-        fail ToUnplausible, "The given value for the to attribute is not a plausible phone number.\nMaybe the country code is missing." unless receiver_plausible?
-      end
-
-      def receiver_plausible?
-        receiver_present? && Phony.plausible?(message.to)
-      end
-
-      def receiver_present?
-        !message.to.nil? && !message.to.empty?
-      end
-
-      def sender_present?
-        !message.from.nil? && !message.from.empty?
-      end
-
-      def sender_length?
-        sender_present? && message.from.length <= 11
-      end
-
-      def body_present?
-        !message.body.nil? && !message.body.empty?
-      end
-
-      def body_correct_length?
-        body_present? && message.body.length <= 160
-      end
-
-      def product_token_present?
-        !ActionTexter.config.product_token.nil? && !ActionTexter.config.product_token.empty?
-      end
-    end
-  end
-end

data/lib/action_texter/validator/request.rb

@@ -1,26 +0,0 @@
-module ActionTexter
-  module Validator
-    class Request
-      class ProductTokenMissing < ArgumentError; end
-      class EndpointMissing < ArgumentError; end
-      class PathMissing < ArgumentError; end
-      class ContentTypeMissing < ArgumentError; end
-
-      def initialize
-        @endpoint     = ActionTexter.config.endpoint
-        @path         = ActionTexter.config.path
-        @content_type = ActionTexter.config.content_type
-        @api_key      = ActionTexter.config.product_token
-
-        validate
-      end
-
-      def validate
-        fail EndpointMissing, "Please provide an valid api endpoint.\nIf you leave this config blank, the default will be set to https://rest.sms-service.org  ." if @endpoint.nil? || @endpoint.empty?
-        fail ContentTypeMissing, 'Please provide a valid content_type! Defaults to application/json' if @content_type.nil? || @content_type.empty?
-        fail PathMissing, "Please provide an valid api path.\nIf you leave this config blank, the default will be set to /message." if @path.nil? || @path.empty?
-        fail ProductTokenMissing, "Please provide an valid product key.\nAfter signup at https://www.messagebird.com/, you will find one in your settings." if @api_key.nil?
-      end
-    end
-  end
-end