smsfly 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160039d430bf5dfe5c5b07c7aef7d9812d29cf7c
-  data.tar.gz: e475e66676f7b1f411dec0b8bce1e906be74914d
+  metadata.gz: 281f37c170f68433828a257d7ed0fae97d390a90
+  data.tar.gz: 8e5d57ecdb4227bc5dfe8016c063b98652971a53
 SHA512:
-  metadata.gz: 81af730bbc731f037702ff6929799d5138ed7a2db534de70efd033608e2be64c90b16a01f63d219d0e33cb02e2ccc9584b018d5aa73ca0e2748d047fc1ecdda2
-  data.tar.gz: 31d759249ebf9606d8e8b5245280b2235021eb91fb82abfe454920f0f7377c6f6792bc799aaf8d0ece3d5a9f4ce5a634272c4605728489851da20c61256a4374
+  metadata.gz: 8e2b6db1af9a3a0d1715a9c3c2798043c615a439bbc3c9e7f776bc190e66e166d0dfdbd2c5037348b27f412c66ccb590f8f6b0d2f52e2a8e56ff5f88e1433699
+  data.tar.gz: fdb40bebaf78effb81701805af20f964a4621a9585afbf1ea42531aa817311b3232aa7665c3a325adabc3605fb0fd14b9a6423371fa016a6655a8d50749eab2e

data/README.md

@@ -10,7 +10,7 @@ TODO:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'smsfly', '~> 0.4.3'
+gem 'smsfly', '~> 0.4.6'
 ```
 
 And then execute:
@@ -38,6 +38,24 @@ Smsfly.configuration do |config|
   config.password = 'You password' # Like this  ZhHtgj4Z
 end
 ```
+Or another method
+
+```ruby
+#/YouApp/config/application.rb
+    module YouApp
+      class Application < Rails::Application
+      ENV['SMS_FLY_USER'] = 'You login' # Like this 380675807873
+      ENV['SMS_FLY_PASS'] = 'Your password' # Your password at  https://sms-fly.com/
+      end
+    end
+#and  config/initializers/smsfly.rb
+    Smsfly.configuration do |config|
+      config.login = ENV['SMS_FLY_USER'] 
+      config.password = ENV['SMS_FLY_PASS']
+    end
+```
+
+
 
 Test connection to API:
 
@@ -77,7 +95,7 @@ Smsfly.test_sms('You random text')
 To send a message to other numbers, use
 
 ```ruby
-Smsfly.send_sms(text, recipient)  #  For example Smsfly.send_sms('Hellow Word', '380675807873')
+Smsfly.send_sms(text, recipient , description , source)  #  For example Smsfly.send_sms('Hello Word', '380675807873' , 'Name for Sms' , 'Alfaname')
 ```
 
 ## Development

data/lib/rails/generators/smsfly/config/templates/initializer.rb

@@ -1,4 +1,7 @@
 Smsfly.configuration do |config|
-  config.login = 'You login at  https://sms-fly.com/'
-  config.password = 'Your password at  https://sms-fly.com/'
-end
+  config.login = 'You login' # Like this 380675807873
+  config.password = 'You password' # Like this  ZhHtgj4Z
+
+  #config.login = ENV['SMS_FLY_USER']
+  #config.password = ENV['SMS_FLY_PASS']
+end

data/lib/smsfly/logger.rb

@@ -0,0 +1,11 @@
+module Smsfly
+  class Logger
+    def self.debug msg
+      if Object.const_defined?('Rails')
+        Rails.logger.debug msg
+      end
+
+      puts msg if ENV['DEBUG'] != nil
+    end
+  end
+end

data/lib/smsfly/version.rb

@@ -1,3 +1,3 @@
 module Smsfly
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

data/lib/smsfly.rb

@@ -1,4 +1,5 @@
 require 'smsfly/version'
+require 'smsfly/logger'
 require 'helpers/configuration'
 require 'net/http'
 require 'uri'
@@ -11,16 +12,20 @@ module Smsfly
   define_setting :login, 'Please configure this file  /config/initializers/smsfly.rb'
   define_setting :password, 'Please configure this file  /config/initializers/smsfly.rb'
 
+  class << self
+    delegate :debug, to: ::Smsfly::Logger
+  end
+
   def self.connect_info
 
     if Smsfly.login.length == 12
-      puts 'You login:' "#{Smsfly.login}"
-      puts 'You password:' "#{Smsfly.password}"
+      debug 'You login:' "#{Smsfly.login}"
+      debug 'You password:' "#{Smsfly.password}"
       return true
     else
-      puts  'Incorrect login'
-      puts  'Login must be like 380675807873'
-      puts  'Please configure this file  /config/initializers/smsfly.rb'
+      debug  'Incorrect login'
+      debug  'Login must be like 380675807873'
+      debug  'Please configure this file  /config/initializers/smsfly.rb'
       return false
     end
   end
@@ -37,8 +42,6 @@ module Smsfly
     return "\033[#{bgColor_code};#{color_code}m#{text}\033[0m"
   end
 
-
-
   def self.authentication?
     xml_string = <<XML
       <?xml version="1.0" encoding="utf-8"?>
@@ -55,14 +58,14 @@ XML
     request.body = xml_string
     response = http.request(request)
     if response.body.to_s == 'Access denied!'
-      puts   "#{colorize('#############################', "red", "red")}"
-      puts   "#{colorize('#', "red", "red")}"+"#{colorize('Incorrect Login or Password', "red")}"+ "#{colorize('#', "red", "red")}"
-      puts   "#{colorize('#############################', "red", "red")}"
+      debug   "#{colorize('#############################', "red", "red")}"
+      debug   "#{colorize('#', "red", "red")}"+"#{colorize('Incorrect Login or Password', "red")}"+ "#{colorize('#', "red", "red")}"
+      debug   "#{colorize('#############################', "red", "red")}"
       return false
     else
-      puts   "#{colorize('###########################', "green" , "green")}"
-      puts  "#{colorize('#', "green", "green")}"+ "#{colorize('Successful Authentication', "green")}"+ "#{colorize('#', "green", "green")}"
-      puts   "#{colorize('###########################', "green" , "green")}"
+      debug   "#{colorize('###########################', "green" , "green")}"
+      debug  "#{colorize('#', "green", "green")}"+ "#{colorize('Successful Authentication', "green")}"+ "#{colorize('#', "green", "green")}"
+      debug   "#{colorize('###########################', "green" , "green")}"
       return true
     end
 
@@ -70,9 +73,9 @@ XML
 
   def self.balance
     if  !self.authentication?
-      puts   "#{colorize('#############################', "red", "red")}"
-      puts   "#{colorize('#', "red", "red")}"+"#{colorize('Incorrect Login or Password', "red")}"+ "#{colorize('#', "red", "red")}"
-      puts   "#{colorize('#############################', "red", "red")}"
+      debug   "#{colorize('#############################', "red", "red")}"
+      debug   "#{colorize('#', "red", "red")}"+"#{colorize('Incorrect Login or Password', "red")}"+ "#{colorize('#', "red", "red")}"
+      debug   "#{colorize('#############################', "red", "red")}"
       return false
     else
       xml_string = <<XML
@@ -90,7 +93,7 @@ XML
       request.body = xml_string
       response = http.request(request)
       balance =  response.body.match(/<balance>(.*)<\/balance>/)[1]
-      puts   "#{colorize('##', "red", "red")}"+"#{colorize("You balance: #{balance}  UAH",  "red")}"+"#{colorize('##', "red", "red")}"
+      debug "#{colorize('##', "red", "red")}"+"#{colorize("You balance: #{balance}  UAH",  "red")}"+"#{colorize('##', "red", "red")}"
       return balance.to_f
     end
   end
@@ -122,18 +125,16 @@ XML
     request.basic_auth login, password
     request.body = xml_string
     response = http.request(request)
-    puts response.code
-    puts response.body
+    debug response.code
+    debug response.body
   end
 
 
-  def self.send_sms(text, recipient)
-    description = 'Smsfly'
+  def self.send_sms(text, recipient , description , source )
     start_time = 'AUTO'
     end_time = 'AUTO'
     rate = 1
     lifetime = 4
-    source = 'SMS'
     xml_string = <<XML
       <?xml version="1.0" encoding="utf-8"?>
       <request>
@@ -153,7 +154,7 @@ XML
     request.basic_auth login, password
     request.body = xml_string
     response = http.request(request)
-    puts response.body
+    debug response.body
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smsfly
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Serhii-Danovsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - lib/rails/generators/smsfly/config/templates/initializer.rb
 - lib/rails/generators/smsfly/config/templates/smsfly.yml
 - lib/smsfly.rb
+- lib/smsfly/logger.rb
 - lib/smsfly/version.rb
 - smsfly.gemspec
 homepage: https://github.com/Serhii-Danovsky/smsfly
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem for send SMS with API https://sms-fly.com/