chuanglan 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8cd2bcd5507a7d5f90450e3d55725a978f01957
-  data.tar.gz: 5dbf0ef2f5e9341001d60fc9e2a3e1ddd0ea8a66
+  metadata.gz: 6b8b4f4a43937f6cc143da99126052b225cfa1bb
+  data.tar.gz: ce6c6b8cc58f4e2b87f01e6cc5f2da24dc3ada0c
 SHA512:
-  metadata.gz: 856eecf4e3bf5ded9fba1445f4ab031a268bf752e3b16519d8c4fc1c5e1e4a180b0778e62a5434717dda3f76e7b84dd6112807a9829058432f1a236963b9e3f1
-  data.tar.gz: b76da84f6c680dbb470c509e21989b681845ac65564fcd61e8891c86349abca447dc0b942d1f7e2b09510feb91890c517284872240b0f20ca4d921ca8d610d58
+  metadata.gz: c8437d052a19f82b2903543af9925dd5eba6011f3b9526bd618d0cf1dad2856710d22494e4ef115c3c33fe1d2fa3b29c17a8b5b2df046cf2928c662a5c350c4c
+  data.tar.gz: b04da6407495a827620c45961654b6e393540080240792f91d449db6d80d0f067726a24c4ee02895b7762aa0b458088a6f39394fb7e3b6151c321a65b6f7dbd0

data/README.md

@@ -23,15 +23,31 @@ Or install it yourself as:
 ```ruby
 Chuanglan.username = 'username'
 Chuanglan.password = 'password'
+
+Chuanglan::International.username = 'international_username'
+Chuanglan::International.password = 'international_password'
 ```
 
-### Send sms
+### Send SMS
 
 ```ruby
 Chuanglan.send_to!('10086', '流量唔够用啊')
-# Chuanglan.send_to!(['10086', '10010'], '信号好差啊')
+Chuanglan.send_to!(['10086', '10010'], '信号好差啊')
+Chuanglan.send_to!('10086', '流量唔够用啊', un: 'un', pw: 'pw', rd: 0, ex: 'ex')
+```
+
+### Check balance
+
+```ruby
+Chuanglan.balance # => 100
 ```
 
+### Send International SMS
+
+```ruby
+Chuanglan::International.send_to!('8613612345678', '流量唔够用啊')
+Chuanglan::International.send_to!('8613612345678', '流量唔够用啊', un: 'un', pw: 'pw', dc: 15, rf: 1, tf: 3)
+```
 
 ## Development
 
@@ -41,7 +57,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/chuanglan. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/GaiaMagic/chuanglan. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/chuanglan.rb

@@ -1,16 +1,42 @@
 require 'chuanglan/version'
+require 'chuanglan/international'
 require 'chuanglan/request'
 require 'chuanglan/request_exception'
 
 module Chuanglan
-  GATEWAY = 'http://222.73.117.158:80/msg/HttpBatchSendSM'
+  GATEWAY = 'https://sms.253.com'
   @timeout = 5
 
   class << self
     attr_accessor :username, :password, :timeout
 
-    def send_to!(recipients, message)
-      Request.new(recipients, message).perform!
+    def send_to!(recipients, message, params = {})
+      params = base_params.merge(params)
+      params[:phone] = Array(recipients).join(',')
+      params[:msg] = message
+      rsp = Request.new("#{GATEWAY}/msg/send", params).perform
+      success_or_raise_exception(rsp)
+    end
+
+    def balance
+      rsp = Request.new("#{GATEWAY}/msg/balance", un: username, pw: password).perform
+      success_or_raise_exception(rsp).to_i
+    end
+
+    private
+
+    def base_params
+      {
+        un: username,
+        pw: password,
+        rd: 1,
+      }
+    end
+
+    def success_or_raise_exception(response)
+      headers, data   = response.body.split("\n")
+      timestamp, code = headers.split(',')
+      code == '0' ? data : raise(RequestException.new(code))
     end
   end
 end

data/lib/chuanglan/international.rb

@@ -0,0 +1,34 @@
+module Chuanglan
+  class International
+    GATEWAY = 'https://intapi.253.com'
+
+    class << self
+      attr_accessor :username, :password, :timeout
+
+      def send_to!(recipients, message, params = {})
+        params = base_params.merge(params)
+        params[:da] = Array(recipients).join(',')
+        params[:sm] = message
+        rsp = Request.new("#{GATEWAY}/mt", params).perform
+        success_or_raise_exception(rsp)
+      end
+
+      private
+
+      def base_params
+        {
+          un: username,
+          pw: password,
+          dc: 15,
+          rf: 1,
+          tf: 3,
+        }
+      end
+
+      def success_or_raise_exception(response)
+        data = URI.decode_www_form(response.body).to_h
+        data['id'] || raise(RequestException.new(data['r']))
+      end
+    end
+  end
+end

data/lib/chuanglan/request.rb

@@ -2,42 +2,19 @@ require 'net/http'
 
 module Chuanglan
   class Request
-    def initialize(recipients, message)
-      @recipients = Array(recipients)
-      @message = message
+
+    def initialize(url, params)
+      @uri = URI(url)
+      @params = params
     end
 
-    def perform!
-      uri = URI(GATEWAY)
+    def perform
       timeout = Chuanglan.timeout
-      response = Net::HTTP.start(uri.host,
-                                  uri.port,
-                                  open_timeout: timeout,
-                                  read_timeout: timeout) do |http|
-        post_data = URI.encode_www_form(payload)
-        http.request_post(uri.path, post_data)
+      is_https = @uri.scheme == 'https'
+      Net::HTTP.start(@uri.host, @uri.port, open_timeout: timeout, read_timeout: timeout, use_ssl: is_https) do |http|
+        post_data = URI.encode_www_form(@params)
+        http.request_post(@uri.path, post_data)
       end
-
-      success_or_raise_exception(response)
-    end
-
-    private
-
-    def payload
-      {
-        account: Chuanglan.username,
-        pswd: Chuanglan.password,
-        mobile: @recipients.join(','),
-        msg: @message,
-        needstatus: 'true',
-      }
-    end
-
-    def success_or_raise_exception(response)
-      headers, msgid= response.body.split("\n")
-      timestamp, code = headers.split(',')
-
-      code == '0' || raise(RequestException.new(code))
     end
   end
 end

data/lib/chuanglan/request_exception.rb

@@ -1,6 +1,7 @@
 module Chuanglan
   class RequestException < StandardError
     ERROR_MESSAGES = {
+      '100' => 'Bad API Address',
       '101' => 'No such user',   # Not officially documented
       '102' => 'Wrong password',
       '103' => 'Push too hurry',

data/lib/chuanglan/version.rb

@@ -1,3 +1,3 @@
 module Chuanglan
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chuanglan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - HungYuHei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - bin/setup
 - chuanglan.gemspec
 - lib/chuanglan.rb
+- lib/chuanglan/international.rb
 - lib/chuanglan/request.rb
 - lib/chuanglan/request_exception.rb
 - lib/chuanglan/version.rb
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for 创蓝短信网关