action-texter 0.2.0.pre → 0.2.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea093bbb16240a1e70407f1551044dddd2884f7
-  data.tar.gz: ba9a6f767cd07ff9ecc626742b81eeb57435d797
+  metadata.gz: 3365998189231761f4c8d7a5d15ac96bd8a4b13d
+  data.tar.gz: 9edb21e259152ac8557be7c4664ac2a877418006
 SHA512:
-  metadata.gz: 5156997c15eeb5f73808d2073e8f97e7634d7778f2d17e291c06f9895da080e34534d02852ac7a3efade471db268bccd5357d9e305df239301829a3cee19c580
-  data.tar.gz: a337e79222dac9079053ae5142bd569808eba1bc3f408c7c85a0d55b31f447460588f4222afeb8c2006b77413b0df1001e5badad6c04f5f797eac06b19dd2fbb
+  metadata.gz: 1d78b996d9ca7b094b2b6dd3b218be54b3b9993ac2033696608e3f8839ede40b1dfbc9d2248a4f2713709d30d0c828f020de2f2af0c80641e29f1e8ebcde7db7
+  data.tar.gz: e9ecd898ee8d64ddd7c75454ef2258c7efd7b425e4f5b05e5d62e9422519f59ee4c30e1ec9020451c48b26069b2aa008a4b732abde1b3915c0ce409b3ada1271

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    action-texter (0.2.0.pre)
+    action-texter (0.2.1.pre)
       class_attribute (~> 0.1)
       facets (~> 3.0)
       json

data/lib/action_texter/configuration.rb

@@ -1,11 +1,11 @@
 module ActionTexter
   class Configuration
-    attr_accessor :from, :to, :endpoint, :path, :product_token, :content_type, :delivery_method
+    attr_accessor :from, :to, :subject, :endpoint, :path, :product_token, :content_type, :delivery_method
 
     alias_method :api_key=, :product_token=
 
     def defaults
-      @defaults ||= { from: from, to: to }
+      @defaults ||= { from: from, to: to, subject: subject }
     end
 
     def initialize

data/lib/action_texter/delivery_methods.rb

@@ -21,9 +21,9 @@ module ActionTexter
 
         # 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 :mail, ActionTexter::Provider::Mail::Delivery, { charset: 'utf8' } 
+        add_delivery_method :test, ActionTexter::TestMessage
+        add_delivery_method :messagebird, ActionTexter::Messagebird::Delivery, { endpoint: 'https://rest.messagebird.com', path: '/messages' }
+        add_delivery_method :mail, ActionTexter::Mail::Delivery, { charset: 'utf8' } 
         # add_delivery_method :twilio, ActionTexter::TwilioDelivery
         # add_delivery_method :whitelist_proxy, ActionTexter::WhitelistProxyDelivery
       end
@@ -34,8 +34,8 @@ module ActionTexter
       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
+      delegate deliveries: ActionTexter::TestMessage
+      delegate :deliveries= => ActionTexter::TestMessage
 
       # Adds a new delivery method through the given class using the given symbol
       # as alias and the default options supplied:

data/lib/action_texter/gem_version.rb

@@ -7,7 +7,7 @@ module ActionTexter
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     PRE   = 'pre'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

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

@@ -1,30 +1,28 @@
 require 'mail'
 module ActionTexter
-  module Provider
-    module Mail
-      class Delivery
-      
-        def initialize(settings = {})
-          @charset = settings[:charset]
-        end
+  module Mail
+    class Delivery
+    
+      def initialize(settings = {})
+        @charset = settings[:charset]
+      end
 
-        def deliver(message)
+      def deliver(message)
 
-          mail = ::Mail.new do |mail|
-            from message.from
-            to message.to
-            cc message.cc 
-            subject message.subject
-            body message.body.to_s
+        mail = ::Mail.new do |mail|
+          from message.from
+          to message.to
+          cc message.cc 
+          subject message.subject
+          body message.body.to_s
 
-            self.charset = @charset
-          end
+          self.charset = @charset
+        end
 
-          #LOGGER.info(mail.body)
+        #LOGGER.info(mail.body)
 
-          mail.deliver!
+        mail.deliver!
 
-        end
       end
     end
   end

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

@@ -1,29 +1,27 @@
 require 'json'
 module ActionTexter
-  module Provider
-    module Messagebird
-      class Delivery
-        attr_accessor :body
-        attr_reader :response
+  module Messagebird
+    class Delivery
+      attr_accessor :body
+      attr_reader :response
 
-        def initialize(settings)
-          @endpoint = settings[:endpoint]
-          @path = settings[:path]
-        end
+      def initialize(settings)
+        @endpoint = settings[:endpoint]
+        @path = settings[:path]
+      end
 
-        def deliver message
-          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
+      def deliver message
+        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
+      def to_json message
+          JSON.generate(recipients: message.to,
+                        originator: message.from,
+                        body: message.body)
       end
     end
   end

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

@@ -1,33 +1,31 @@
 module ActionTexter
-  module Provider
-    module Messagebird
-      
-      class Response
-        attr_reader :net_http_response, :body, :code
+  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 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 success?
+        code.to_i == 201
+      end
 
-        def failure?
-          !success?
-        end
+      def failure?
+        !success?
+      end
 
-        def body
-          if success?
-            SuccessResponse.new(@body)
-          else
-            ErrorResponse.new(@body)
-          end
+      def body
+        if success?
+          SuccessResponse.new(@body)
+        else
+          ErrorResponse.new(@body)
         end
       end
-
     end
+
   end
 end

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

@@ -1,32 +1,30 @@
 require 'json'
 module ActionTexter
-  module Provider
-    module Messagebird
-      class ErrorResponse
+  module Messagebird
+    class ErrorResponse
 
-        attr_reader :code, :description
+      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'
-        }
+      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 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 errors
+        @errors.map { |e| e.merge(error_message: ERROR_CODES[e[:code]]) }
+      end
 
-        def count
-          @errors.count
-        end
+      def count
+        @errors.count
       end
     end
   end

data/lib/action_texter/provider/messagebird/response_recipient.rp

@@ -0,0 +1,13 @@
+module ActionTexter
+  module Messagebird
+    class Recipient
+      attr_reader :recipient, :status, :status_datetime
+
+      def initializer(recipient)
+        @recipient = recipient[:recipient]
+        @status = recipient[:status]
+        @status_datetime = recipient[:statusDatetime]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module ActionTexter
+  module Messagebird
+    class Response
+      class Rcipients
+        attr_reader :total_count, :total_sent_count, :total_delivered_count, :items
+
+        def initiliazer(recipients)
+          @recipients = recipients
+          @total_count = recipients[:totalCount]
+          @total_sent_count = recipients[:totalSentCount]
+          @total_count = recipients[:totalDeliveredCount]
+        end
+
+        def items
+          @recipients[:items].map do |i|
+            ActionTexter::Messagebird::Recipient.new(item(i))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,74 +1,55 @@
 # 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
+module ActionTexter
+  module Messagebird
+    class Response
+      class Success
+
+        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
 
-      private
+        def scheduled_datetime
+          Date.parse(@scheduled_datetime) unless @scheduled_datetime.nil?
+        end
 
-      def items
-        @recipients[:items].map do |i|
-          OpenStruct.new(item(i))
+        def created_datetime
+          Date.parse(@created_datetime) unless @created_datetime.nil?
         end
-      end
 
-      def item(item)
-        {
-          recipient: item[:recipient],
-          status: item[:status],
-          status_datetime: Date.parse(item[:statusDatetime])
-        }
+        def recipients
+          ActionTexter::Messagbird::Recipients.new(@recipients) unless @recipients.nil?
+        end
       end
     end
   end

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

@@ -0,0 +1,20 @@
+require 'class_attribute'
+module ActionTexter
+  class TestMessage
+    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

data/lib/action_texter.rb

@@ -9,22 +9,20 @@ module ActionTexter
   autoload :MessageDelivery, 'action_texter/message_delivery'
   autoload :DeliveryMethods, 'action_texter/delivery_methods'
 
-  module Provider
-    module Mail
-      autoload :Delivery, 'action_texter/provider/mail/delivery'
-    end
-    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
+  module Mail
+    autoload :Delivery, 'action_texter/provider/mail/delivery'
   end
 
+  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
+
+  autoload :TestMessage, 'action_texter/provider/test_message/test_message'
+
   class << self
     
     def configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action-texter
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.1.pre
 platform: ruby
 authors:
 - oliverzeyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,8 +169,10 @@ files:
 - 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_recipient.rp
+- lib/action_texter/provider/messagebird/response_recipients.rb
 - lib/action_texter/provider/messagebird/response_success.rb
-- lib/action_texter/provider/test_message/delivery.rb
+- lib/action_texter/provider/test_message/test_message.rb
 - lib/action_texter/request.rb
 - lib/action_texter/response.rb
 - lib/action_texter/version.rb

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

@@ -1,24 +0,0 @@
-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