zenvia-rb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45630c99fb6c3b92ef041b075aa4604ff1510686
-  data.tar.gz: 35f252225ca1536648befa7e3b8df79979c79fb7
+  metadata.gz: dd4ed3e11aa13c235c4032f290bc96d36c89fb13
+  data.tar.gz: be275be2d47c4c31089cc4458c8af979d4ea6e76
 SHA512:
-  metadata.gz: 4ff7e3fe6960b1ade586035710a36e6e238fb787258e2738c3e7e1b4db3b403a920eea2f33aba39eb248153ba1ea9b9cf1efb81c5da311e97eb9cd0924ffc431
-  data.tar.gz: 025e845ec65683c865641df226e06e3b9b4ec9cda86cfd89d1dd9a803a48d47ad93e09dd3eee69daf9b3dcd3d26bac16eee92553c8bde8225b162faf5cd5d7c0
+  metadata.gz: c202e68f27e82bad7795d58f7a5739c6ec7d7848d03d969412c4879b19740b4aca7024a130f6fe082eac6ade4ec4b0012305233991598c01a7b79ede4ea4c9f0
+  data.tar.gz: 9d97a88d09bde51510570baa0cfaad74924236ac3e245dcc49f579cb57a5e50eb3a92d6fbeafb6f4cff6d659f9466a2ec42a6c990dee0bbe5f0aaad4e1613f46

data/README.md

@@ -5,7 +5,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'zenvia-rb', '~> 0.0.3'
+gem 'zenvia-rb', '~> 0.0.5'
 ```
 
 And then execute:
@@ -19,24 +19,18 @@ HTTParty is the only dependency for this gem.
 
 ## Usage
 
-### Configuration
 In your script
+
 ```ruby
 require 'zenvia'
+
 Zenvia.configure {|config|
     config.account = account_given_by_zenvia
     config.code = code_given_by_zenvia
-    config.name = user_or_enterprise_name # optional
+    config.from = user_or_enterprise_name # optional
 }
 
-```
-
-### Usage
-```ruby
-# if from is nil, the sender name will be set as config.name (as above)
-# if you prefer a definitely nil sender, you can set from = ''
-sms = Zenvia::SMS.new(from, number, message)
-sms.send_message
+Zenvia.send_message(from = config.from, number, message)
 ```
 
 That's all ;)

data/lib/zenvia.rb

@@ -1,13 +1,18 @@
-class Zenvia
+require "zenvia/version"
+require 'zenvia/config'
+require 'zenvia/sms'
+
+module Zenvia
+  # block of configuration
   def self.configure
-    yield Config
+    yield self.config
   end
 
   def self.config
     Config
   end
-end
 
-require "zenvia/version"
-require 'zenvia/config'
-require 'zenvia/sms'
+  def self.send_message(from = nil, number, message)
+    SMS.send_message(from, number, message)
+  end
+end

data/lib/zenvia/config.rb

@@ -1,7 +1,7 @@
 require 'base64'
-class Zenvia
-  module Config
-    attr_accessor :account, :code
+module Zenvia
+  class Config
+    attr_accessor :account, :code, :name
 
     def self.account; @account; end
 
@@ -11,9 +11,9 @@ class Zenvia
 
     def self.code; @code; end
 
-    def self.name=(name); @name = name; end
+    def self.from=(from); @from = from; end
 
-    def self.name; @name; end
+    def self.from; @from; end
 
     private
     def self.auth; Base64.encode64("#{@account}:#{@code}").strip; end

data/lib/zenvia/sms.rb

@@ -1,48 +1,52 @@
 require 'httparty'
 require 'json'
 
-class Zenvia::SMS
-  attr_writer :from, :number, :message
+module Zenvia
+  class SMS
+    attr_writer :from, :number, :message
 
-  # initiate SMS object with
-  # from: user or enterprise name, number: receiver number, message: text
-  def initialize(from = nil, number, message)
-    @from = from.nil? ? Zenvia.config.name : from
-    @number = number
-    exit puts 'letters and other special chars are not accepted in number parameter' unless /^\d*$/.match(@number)
-    @message = message
-  end
-
-  def send_message
-    response = send_sms
-    response = JSON.parse(response.body)
-    puts response['sendSmsResponse']['detailDescription']
-  end
+    # function to send the message
+    # from: user or enterprise name, number: receiver number, message: text
+    def self.send_message(from = nil, number, message)
+      begin
+        @from = from.nil? ? Zenvia.config.from : from
+        @number = number
+        @message = message
+        response = self.send_sms
+        # todo improve returning message with auth error
+        response = JSON.parse(response.body)
+        puts response['sendSmsResponse']['detailDescription']
+      rescue => e
+        puts 'Error!'
+        raise e
+      end
+    end
 
-  private
-  def send_sms
-    # convert number to string (if isn't yet) and insert the country code (standard: BR, 55)
-    # if not found
-    @number = @number.to_s unless @number.class.eql? String
-    @number.insert(0, '55') unless /^55/.match(@number)
-    # retrieve auth value set in Config class
-    @auth = Zenvia.config.auth
-    # Zenvia api's endpoint to send sms
-    endpoint = 'https://api-rest.zenvia360.com.br/services/send-sms'
-    HTTParty.post(endpoint,
-                  body: {
-                      sendSmsRequest: {
-                          from: @from,
-                          to: @number,
-                          msg: @message,
-                          callbackOption: 'NONE'
-                      }
-                  }.to_json,
-                  headers: {
-                      'Content-Type' => 'application/json',
-                      'Authorization' => "Basic #{@auth}",
-                      'Accept' => 'application/json'
-                  }
-    )
+    private
+    def self.send_sms
+      # convert number to string (if isn't yet) and insert the country code (standard: BR, 55)
+      # if not found
+      @number = @number.to_s unless @number.class.eql? String
+      @number.insert(0, '55') unless /^55/.match(@number)
+      # retrieve auth value set in Config class
+      @auth = Zenvia.config.auth
+      # Zenvia api's endpoint to send sms
+      endpoint = 'https://api-rest.zenvia360.com.br/services/send-sms'
+      HTTParty.post(endpoint,
+                    body: {
+                        sendSmsRequest: {
+                            from: @from,
+                            to: @number,
+                            msg: @message,
+                            callbackOption: 'NONE'
+                        }
+                    }.to_json,
+                    headers: {
+                        'Content-Type' => 'application/json',
+                        'Authorization' => "Basic #{@auth}",
+                        'Accept' => 'application/json'
+                    }
+      )
+    end
   end
 end

data/lib/zenvia/version.rb

@@ -1,3 +1,3 @@
-class Zenvia
-  VERSION = "0.0.4"
+module Zenvia
+  VERSION = "0.0.5"
 end

data/zenvia-rb.gemspec

@@ -14,8 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/jefersonhuan/zenvia-rb"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = "https://rubygems.org"
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenvia-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jeferson Huan