smsconnect 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c72f87c7585790b91620ccf0285c85abe11ce62
-  data.tar.gz: 0c6a5fad3d5ee9b9703d1a4ce1dd2ef09f3adba9
+  metadata.gz: 2f891b83da70ce61f6e3e971aa9a2ccd3f26e14a
+  data.tar.gz: 9eaad9281884239069c6125ae6c9b37886db162b
 SHA512:
-  metadata.gz: 08fee47c21187c9288eaea2c66fe66d0ab7c3cf035ce7b7985b97f7cff9ea7aa0c688a966757178f134c9b4a1dadc3f657c1820d4e32f37facf68b711534916f
-  data.tar.gz: b85bef5527af271a610184c832f206ce3282875f1eb0f9ed7ee33bbee1b5388e8b344120c24f399809d73fe9c53f750c7042ccbf1cdf3a4e7cb8ebfb0732fc02
+  metadata.gz: d20ddcbc7c8d31152f8c8052ff6a9862e77ac776e3961224f865f43bf832fa75d38932eb76f63e87ab0bc6afc0383c6f5c6538b615b3b704eeda676eaf88b36c
+  data.tar.gz: 0f8bef82a91e53150faeb0a24c44d29f0a968c202c6e226b2f531da20e67cca05fe8e9d83fd222aefbe74a2542a05fe5289176c37b8261c92b69b86cf1c4e609

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in smsconnect.gemspec
 gemspec
+
+gem 'nokogiri'

data/README.md

@@ -2,9 +2,9 @@
 
 <img align="right" src="http://www.smsbrana.cz/images/logo.png">
 
-Send and receive SMS with node.js (for Czech Republic)
+Send and receive SMS with Ruby (for Czech Republic)
 
-[Registration](http://www.smsbrana.cz/registrace.html)
+[Registration](https://www.smsbrana.cz/registrace.html)
 
 ## Installation
 
@@ -30,21 +30,35 @@ Or install it yourself as:
 require 'smsconnect'
 
 sms = Smsconnect::Smsconnect.new({'login'=>'<your_login>', 'password' => '<your_password>'})
-sms.inbox
+puts sms.inbox
 ```
 
 ### Send SMS
 
+simple usage:
+
+```ruby
+require 'smsconnect'
+
+sms = Smsconnect::Smsconnect.new({'login'=>'<your_login>', 'password' => '<your_password>'})
+puts sms.send('<phone_number>', '<text_sms>')
+```
+
+or you can use other optional params:
+
 ```ruby
 require 'smsconnect'
 
 sms = Smsconnect::Smsconnect.new({'login'=>'<your_login>', 'password' => '<your_password>'})
-sms.send('<phone_number>', '<text_sms>')
+puts sms.send('<phone_number>', '<text_sms>', '<when>', '<delivery_report>', '<sender_id>', '<sender_phone>', '<user_id>', '<data_code>', '<answer_mail>', '<delivery_mail>')
 ```
 
+### 
+
+
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/smsconnect/fork )
+1. Fork it ( https://github.com/pryznar/smsconnect/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/error.rb

@@ -0,0 +1,37 @@
+module Smsconnect
+	class Error
+
+		ERRORS = {
+			'-1' => 'duplicitni user_id - stejne oznacena sms byla odeslana jiz v minulosti',
+			'0' => 'OK',
+			'1' => 'neznama chyba',
+			'2' => 'neplatny login',
+			'3' => 'neplatny hash nebo password (podle varianty zabezpeceni prihlaseni)',
+			'4' => 'neplatny time, vetsi odchylka casu mezi servery nez maximalni akceptovana v nastaveni sluzby SMS Connect',
+			'5' => 'nepovolena IP, viz nastaveni sluzby SMS Connect',
+			'6' => 'neplatny nazev akce',
+			'7' => 'tato sul byla jiz jednou za dany den pouzita',
+			'8' => 'nebylo navazano spojeni s databazi',
+			'9' => 'nedostatecny kredit',
+			'10' => 'neplatne cislo prijemce SMS',
+			'11' => 'prazdny text zpravy',
+			'12' => 'SMS je delsi nez povolenych 459 znaku',
+		}
+
+		def initialize(error)
+			@error = error
+		end
+
+		def message
+			if ERRORS.key? @error
+				return ERRORS[@error]
+			end
+			"Unknown error"
+		end
+
+		def is_error?
+			@error != '0' && @error != nil
+		end
+
+	end
+end

data/lib/smsconnect.rb

@@ -1,12 +1,59 @@
-require "smsconnect/version"
+require 'smsconnect/version'
 require 'digest'
 require 'securerandom'
 require 'net/http'
+require 'nokogiri'
+require 'error'
 
 module Smsconnect
+
+    class SendResponse
+        attr_reader :error, :price, :count, :credit, :sms_id, :plain_xml
+
+        def initialize(err, price, count, credit, sms_id, plain_xml)
+            @error = Error.new(err)
+            @price = price
+            @count = count
+            @credit = credit
+            @sms_id = sms_id
+            @plain_xml = plain_xml
+        end
+
+        def is_error?
+            @error.is_error?
+        end
+    end
+
+    class InboxResponse
+        attr_reader :error, :delivery_sms, :delivery_report
+
+        def initialize(err, delivery_sms, delivery_report)
+            @error = Error.new(err)
+            @delivery_sms = delivery_sms
+            @delivery_report = delivery_report
+        end
+
+        def is_error?
+            @error.is_error?
+        end
+    end
+
+    class CreditResponse
+        attr_reader :error, :credit
+
+        def initialize(err, credit)
+            @error = Error.new(err)
+            @credit = credit
+        end
+
+        def is_error?
+            @error.is_error?
+        end
+    end
+
     class Smsconnect
         
-        API_SCRIPT = "http://api.smsbrana.cz/smsconnect/http.php?"
+        API_SCRIPT = "https://api.smsbrana.cz/smsconnect/http.php?"
         
         def initialize(settings)
             @settings = settings
@@ -17,47 +64,133 @@ module Smsconnect
         end
         
         def getAuth
-            if @settings['login'].nil? && @settings['password'].nil?
-                return false
-                else
-                t = Time.new
-                time = t.strftime("%Y%m%d") + "T" + t.strftime("%H%M%S")
-                salt = self.salt(10)
+            return false if @settings['login'].nil? && @settings['password'].nil?
                 
-                result = {}
-                result['login'] = @settings['login']
-                result['time'] = time
-                result['salt'] = salt
-                result['hash'] = Digest::MD5.hexdigest(@settings['password'] + time + salt)
-                
-                return result
-            end
+            t = Time.new
+            time = t.strftime("%Y%m%d") + "T" + t.strftime("%H%M%S")
+            salt = self.salt(10)
+            
+            result = {}
+            result['login'] = @settings['login']
+            result['time'] = time
+            result['salt'] = salt
+            result['hash'] = Digest::MD5.hexdigest(@settings['password'] + time + salt)
+            
+            result
         end
         
         def inbox
             data = self.getAuth
             data['action'] = 'inbox'
-            data = data.map{|k,v| "#{k}=#{v}"}.join('&')
+            data = data.map{ |k,v| "#{k}=#{v}" }.join('&')
             url = URI.parse(API_SCRIPT + data)
+            http = Net::HTTP.new(url.host, url.port)
+            http.use_ssl = url.scheme == 'https'
+
             req = Net::HTTP::Get.new(url.to_s)
-            res = Net::HTTP.start(url.host, url.port) {|http|
+            res = http.start { |http|
                 http.request(req)
             }
-            puts res.body
+            res.body
+
+            doc = Nokogiri::XML(res.body)
+            err = nil
+            delivery_sms = []
+            delivery_report = []
+            doc.xpath('//result').each do |result|
+                err = result.at_xpath('err').content if result.at_xpath('err')
+                result.xpath('//inbox/delivery_sms/item').each do |a|
+                    delivery_sms << {
+                        number: a.at_xpath('number').text,
+                        time: a.at_xpath('time').text,
+                        message: a.at_xpath('message').text
+                    }
+                end
+
+                err = result.at_xpath('err').content if result.at_xpath('err')
+                result.xpath('//inbox/delivery_report/item').each do |a|
+                    delivery_report << {
+                        idsms: a.at_xpath('idsms').text,
+                        time: a.at_xpath('time').text,
+                        status: a.at_xpath('status').text
+                    }
+                end
+            end
+
+            puts delivery_sms
+            puts delivery_report
+
+            InboxResponse.new(err, delivery_sms, delivery_report)
+        end
+
+        def credit_info
+            data = self.getAuth
+            data['action'] = 'credit_info'
+            data = data.map { |k,v| "#{k}=#{v}" }.join('&')
+            url = URI.parse(API_SCRIPT + data)
+
+            puts url
+            
+            http = Net::HTTP.new(url.host, url.port)
+            http.use_ssl = url.scheme == 'https'
+            req = Net::HTTP::Get.new(url.to_s)
+            res = http.start { |http|
+                http.request(req)
+            }
+
+            doc = Nokogiri::XML(res.body)
+            err = nil
+            price = nil
+            credit = nil
+            sms_count = nil
+            sms_id = nil
+            doc.xpath('//result').each do |result|
+                err = result.at_xpath('err').content if result.at_xpath('err')
+                credit = result.at_xpath('credit').content if result.at_xpath('credit')
+            end
+
+            CreditResponse.new(err, credit)
         end
         
-        def send(number, text)
+        def send(number, text, send_at = nil, delivery_report=nil, sender_id=nil, sender_phone=nil, user_id=nil, data_code=nil, answer_mail=nil, delivery_mail=nil)
             data = self.getAuth
             data['action'] = 'send_sms'
             data['number'] = number
             data['message'] = text.gsub(/ /, '+')
-            data = data.map{|k,v| "#{k}=#{v}"}.join('&')
+
+            data['when'] = send_at if send_at
+            data['delivery_report'] = delivery_report if delivery_report
+            data['sender_id'] = sender_id if sender_id
+            data['sender_phone'] = sender_phone if sender_phone
+            data['user_id'] = user_id if user_id
+            data['data_code'] = data_code if data_code
+            data['answer_mail'] = answer_mail if answer_mail
+            data['delivery_mail'] = delivery_mail if delivery_mail
+            data = data.map { |k,v| "#{k}=#{v}" }.join('&')
             url = URI.parse(API_SCRIPT + data)
+            
+            http = Net::HTTP.new(url.host, url.port)
+            http.use_ssl = url.scheme == 'https'
             req = Net::HTTP::Get.new(url.to_s)
-            res = Net::HTTP.start(url.host, url.port) {|http|
+            res = http.start { |http|
                 http.request(req)
             }
-            puts res.body
+
+            doc = Nokogiri::XML(res.body)
+            err = nil
+            price = nil
+            credit = nil
+            sms_count = nil
+            sms_id = nil
+            doc.xpath('//result').each do |result|
+                err = result.at_xpath('err').content if result.at_xpath('err')
+                price = result.at_xpath('price').content if result.at_xpath('price')
+                sms_count = result.at_xpath('sms_count').content if result.at_xpath('sms_count')
+                credit = result.at_xpath('credit').content if result.at_xpath('credit')
+                sms_id = result.at_xpath('sms_id').content if result.at_xpath('sms_id')
+            end
+
+            SendResponse.new(err, price, sms_count, credit, sms_id, res.body)
         end
     end
 end

data/lib/smsconnect/version.rb

@@ -1,3 +1,3 @@
 module Smsconnect
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test.rb

@@ -0,0 +1,36 @@
+require './lib/smsconnect'
+require './lib/smsconnect/version'
+
+login = 'test'
+password = 'test'
+
+connect = Smsconnect::Smsconnect.new ({'login' => login, 'password' => password})
+
+# result = connect.send('123123123', 'ahoj')
+# result = connect.send('+421918123456', 'test')
+result = connect.inbox
+# result = connect.credit_info
+
+if result.is_error?
+	puts "ERROR:"
+	puts result.error.message
+else
+	puts "OK"
+	if result.is_a? Smsconnect::CreditResponse
+		puts "Credit info: #{result.credit}"
+	elsif result.is_a? Smsconnect::SendResponse
+		puts "Send response"
+		puts " - price #{result.price}"
+		puts " - sms_count #{result.count}"
+		puts " - credit #{result.credit}"
+		puts " - sms_id #{result.sms_id}"
+	elsif result.is_a? Smsconnect::InboxResponse
+		puts "Inbox response"
+		puts " - Delivery SMS"
+		puts result.delivery_sms
+		puts " - Delivery Report" 
+		puts result.delivery_report
+	else
+		puts "Uknown response"
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smsconnect
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pavel Ryznar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,9 +51,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/error.rb
 - lib/smsconnect.rb
 - lib/smsconnect/version.rb
+- smsconnect-0.0.1.gem
 - smsconnect.gemspec
+- test.rb
 homepage: ''
 licenses:
 - MIT
@@ -74,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Send and receive SMS with node.js (for Czech Republic)