smsgh_sms 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de0bd7772c3cb216476527d8ecb26e7d1602d0d4
+  data.tar.gz: 423e63eeee3350d14aab78004d6492897e69f904
+SHA512:
+  metadata.gz: 3c40ad59b1c446619fce1d92a9236bad3130fa772a291d1dce6a5c3511d8610dd051d5e571622104a560057f33c7eb82dd03738fa5dc69af2530306913575426
+  data.tar.gz: 78688f8be287b21eb699b36819ba7306692506d774e6d0c369f5d7ae476a6cafe64e07c65c83dd8207561f901339040a197ba223a3ce440352d51fab0be2e8ca

data/README.md

@@ -20,8 +20,15 @@ Or install it yourself as:
 
 Setup your SMSGH API username and password
 
+If you are using the old API (V2) then
+
 	SmsghSms.api_username = "YOUR_USERNAME"
 	SmsghSms.api_password = "YOUR_PASSWORD"
+
+If you are using the new API (V3) then
+
+	SmsghSms.api_client_id = "YOUR_CLIENT_ID"
+	SmsghSms.api_client_secret = "YOUR_CLIENT_SECRET"
 	
 Optionally set global Sender ID
 

data/lib/smsgh_sms.rb

@@ -3,9 +3,10 @@ require 'cgi'
 require 'curb-fu'
 
 module SmsghSms
-  API_URL = "http://api.smsgh.com/v2/messages/send?"
   @@api_username = nil
   @@api_password = nil
+  @@api_client_id = nil
+  @@api_client_secret = nil
   @@api_senderid = "SMSGHAPI"
   
   # Expects :msg, :to and an optional :from param
@@ -13,12 +14,18 @@ module SmsghSms
   def self.push(options={})
     
     sender_id = options[:from].nil? ? @@api_senderid : options[:from]
-    api_base = "#{API_URL}&username=#{@@api_username}&password=#{@@api_password}&from=#{sender_id}"
-    
-    url = "#{api_base}&text=#{CGI.escape(options[:msg])}&to=#{options[:to]}"
+    response = nil
+
     raise ArgumentError, ':msg and :to params expected' if options[:msg].nil? || options[:to].nil?
+
+    if @@api_username != nil && @@api_password != nil
+      response = CurbFu.get({:host => 'api.smsgh.com', :path => '/v2/messages/send'}, { :from => sender_id, :to => options[:to], :text => options[:msg], :username => @@api_username, :password => @@api_password })
+    end
+
+    if @@api_client_id != nil && @@api_client_secret != nil
+      response = CurbFu.get({:host => 'api.smsgh.com', :path => '/v3/messages/send', :protocol => 'https'}, { :From => sender_id, :To => options[:to], :Content => options[:msg], :ClientId => @@api_client_id, :ClientSecret => @@api_client_secret })
+    end  
     
-    response = CurbFu.get(url)
     {:status => response.status, :notice => response.body}
     
   end
@@ -28,7 +35,14 @@ module SmsghSms
   def self.api_username; @@api_username; end
   def self.api_password=(api_password); @@api_password = api_password; end
   def self.api_password; @@api_password; end
+  def self.api_client_id=(api_client_id); @@api_client_id = api_client_id; end
+  def self.api_client_id; @@api_client_id; end
+  def self.api_client_secret=(api_client_secret); @@api_client_secret = api_client_secret; end
+  def self.api_password; @@api_client_secret; end
   def self.api_senderid=(api_senderid); @@api_senderid = api_senderid; end
   def self.api_senderid; @@api_senderid; end
   
-end
+endd); @@api_senderid = api_senderid; end
+  def self.api_senderid; @@api_senderid; end
+  
+end

data/lib/smsgh_sms/version.rb

@@ -1,3 +1,3 @@
 module SmsghSms
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/smsgh_sms.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |gem|
   gem.name          = "smsgh_sms"
   gem.require_paths = ["lib"]
   gem.version       = SmsghSms::VERSION
-  gem.add_dependency "curb-fu"
+  gem.add_dependency "curb-fu", "~> 0"
 end

metadata

@@ -1,47 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smsgh_sms
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Alfred Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-06-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: curb-fu
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: This is a ruby wrapper that abstracts the SMSGH's SMS API. This gem has extra garnishing to make smsing via Ruby more tasteful and less painful.'
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This is a ruby wrapper that abstracts the SMSGH's SMS API. This gem has
+  extra garnishing to make smsing via Ruby more tasteful and less painful.'
+email:
 - alfred@ncodedevlabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -51,37 +42,25 @@ files:
 - smsgh_sms.gemspec
 homepage: https://github.com/nukturnal/smsgh_sms
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Send SMS via SMSGH's API
 test_files: []
-
-has_rdoc: