china_sms 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e1d464107001de01cf62059455990cea08a5b6
-  data.tar.gz: 3b9f52a9340f4e972e89bff6645d08e9591a35fe
+  metadata.gz: 17e5ab2da8313d489fd637a216018f23eeb48110
+  data.tar.gz: eab26a7375d7cd5cc2d3c1fcd3f366f8c790760e
 SHA512:
-  metadata.gz: 6a99f5f6d51fc05ba0aeaf07c9f3aae9d3d0eb20895eb01d694ed75c62dcc9a6932071bdab82d9e846564e4ae507efb7e59050e6e41957276bfa6018cd2a0d0f
-  data.tar.gz: 4f17931a90aeac83e78e108a1bb323dc9f5ccd3fe5245de265afb6043bc47dc4ef47d3ab6542f9246c352bc48c21cb37bae9940483c647211fb97a191d820d8a
+  metadata.gz: 58907bb3cdbba273d491cf358faaedc0915681948510afdb411147cb5f680bfe83a1ff330bc2a53c2cca2ad98a50e4613cb274bba19b2217b1e84ca85636b90b
+  data.tar.gz: 386027184fd3f393239292976ce2932a7e7c4b0199e7db226de1747ceae812b8e9f2d0fea57ff81623becc332b92c98a2eaa1d8a06db2e25801a9051214c15a3

data/README.md

@@ -7,6 +7,7 @@
 所有短信平台都禁止发送私人短信，并要求在短信内容末尾加上签名后缀，如【19屋】
 
 * [推立方](http://tui3.com/) 专注于注册校验码等实时应用，需要[配置内容格式和签名](http://www.tui3.com/Members/smsconfigv2/)，会自动在短信加上签名后缀。短信计数：移动/联通每条短信的最大长度为64字符，电信每条最大长度60字符（半角、全角各算一个）。超过该长度后，短信后面自动增加分页信息(x/y),此时，每条短信最大长度需要再减3（不超过10页）
+* [云片网](http://www.yunpian.com/) 专注于帮助企业与客户更好的沟通, 提供短信服务, 功能强大, 可以配置多种[模板](http://www.yunpian.com/api/tpl.html), 实时性高, 定制型强, 价格优惠.
 * [短信宝](http://www.smsbao.com/)
 * [畅友网络](http://www.chanyoo.cn/) 群发短信需要半小时左右的时间审核，星期五等繁忙时段会有几个小时的延时，不适合发送注册校验码等实时短信，单次最多发送500个号码
 * [亿美软通](http://www.emay.cn/)
@@ -30,9 +31,17 @@
 ## 使用
 
 ```ruby
-# 支持 :tui3, :smsbao, chanyoo, emay 短信接口
+# 支持 :tui3, :yunpian, :smsbao, :chanyoo, :emay 短信接口
 ChinaSMS.use :tui3, username: 'YOUR_USERNAME', password: 'YOUR_PASSWORD'
 ChinaSMS.to '13912345678', '[Test]China SMS gem has been released.'
+
+# :yunpian 的参数有
+#    :company    默认是 `云片网`
+#    :tpl_id     默认是 2
+
+ChinaSMS.use :yunpian, password: 'YOUR_API_KEY'
+ChinaSMS.to '13912345678', '[Test]China SMS gem has been released.', company: '19Wu'
+
 ```
 
 ## 贡献
@@ -47,5 +56,5 @@ bundle console # 请不要使用 irb，可能会有依赖问题
 
 在安全性方面，很多接口都是使用用户登录明文密码，推立方 和 短信宝 要好一些。
 
-* **推立方**，不使用登录密码，而是由系统自动生成一长串 API_KEY，专用于接口调用
+* **推立方**，**云片网**，不使用登录密码，而是由系统自动生成一长串 API_KEY，专用于接口调用
 * **短信宝**，使用登录密码，但在调用时要先转成 MD5

data/china_sms.gemspec

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -18,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"

data/lib/china_sms.rb

@@ -8,30 +8,36 @@ end
 module ChinaSMS
   extend self
 
-  def username
-    @username
-  end
-
-  def password
-    @password
-  end
+  attr_reader :username, :password
 
   def use(service, options)
     @service = ChinaSMS::Service.const_get("#{service.to_s.capitalize}")
+    @service.const_set("URL", options[:base_uri]) if options[:base_uri]
     @username = options[:username]
     @password = options[:password]
   end
 
-  def to(receiver, content)
-    @service.to receiver, content, username: @username, password: @password if @service
+  def to(receiver, content, options = {})
+    options = default_options.merge options
+    @service.to receiver, content.strip, options if @service
   end
 
-  def get
-    @service.get username: @username, password: @password if @service
+  def get(options = {})
+    options = default_options.merge options
+    @service.get options if @service
   end
 
   def clear
     @service = @username = @password = nil
   end
 
+  private
+
+  def default_options
+    {
+      username:  @username,
+      password:  @password
+    }
+  end
+
 end

data/lib/china_sms/service/emay.rb

@@ -3,19 +3,17 @@ module ChinaSMS
   module Service
     module Emay
       extend self
-
-      SEND_URL = "http://sdkhttp.eucp.b2m.cn/sdkproxy/sendsms.action"
-      GET_URL = "http://sdkhttp.eucp.b2m.cn/sdkproxy/getmo.action"
+      URL = "http://sdkhttp.eucp.b2m.cn/sdkproxy"
 
       def to(phone, content, options)
         phones = Array(phone).join(',')
-        res = Net::HTTP.post_form(URI.parse(SEND_URL), cdkey: options[:username], password: options[:password], phone: phones, message: content)
+        res = Net::HTTP.post_form(URI.parse("#{URL}/sendsms.action"), cdkey: options[:username], password: options[:password], phone: phones, message: content)
         result res.body
       end
 
       def get(options)
         # res = Net::HTTP.post_form(URI.parse(GET_URL), cdkey: options[:username], password: options[:password])
-        url = GET_URL + "?cdkey=#{options[:username]}&password=#{options[:password]}"
+        url = "#{URL}/getmo.action?cdkey=#{options[:username]}&password=#{options[:password]}"
         res = Net::HTTP.get(URI.parse(url))
         res.body
       end

data/lib/china_sms/service/smsbao.rb

@@ -5,6 +5,7 @@ module ChinaSMS
       extend self
 
       URL = "http://api.smsbao.com/sms"
+      REMAIN_URL = "http://www.smsbao.com/query"
 
       MESSAGES = {
         '0'  => '短信发送成功',
@@ -23,6 +24,18 @@ module ChinaSMS
         result res.body
       end
 
+      def get options
+        res = Net::HTTP.post_form(URI.parse(REMAIN_URL), u: options[:username], p: Digest::MD5.hexdigest(options[:password]))
+        r = res.body.match(/(\d+)\n(\d+),(\d+)/)
+        {
+          success: (r[1] == '0'),
+          code: r[1],
+          message: MESSAGES[r[1]],
+          send: r[2].to_i,
+          remain: r[3].to_i
+        }
+      end
+
       def result(code)
         {
           success: (code == '0'),

data/lib/china_sms/service/yunpian.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+module ChinaSMS
+  module Service
+    module Yunpian
+      extend self
+
+      URL     = "http://yunpian.com/v1/sms/tpl_send.json"
+      GET_URL = "http://yunpian.com/v1/sms/get.json"
+
+      def to phone, content, options = {}
+        message = parse_content content, options[:company]
+        options[:tpl_id] ||= 2
+        options[:apikey] ||= options[:password]
+        except! options, :username, :password, :company
+        options.merge!({mobile: phone, tpl_value: message})
+        res = Net::HTTP.post_form(URI.parse(URL), options)
+        result res.body
+      end
+
+      def get options = {}
+        options[:apikey] ||= options[:password]
+        except! options, :username, :password, :company
+        res = Net::HTTP.post_form(URI.parse(GET_URL), options)
+        result res.body
+      end
+
+      def result body
+        begin
+          JSON.parse body
+        rescue => e
+          {
+            code: 502,
+            msg: "内容解析错误",
+            detail: e.to_s
+          }
+        end
+      end
+
+      private
+
+      def except! options = {}, *keys
+        keys.each {|key| options.delete(key)}
+        options
+      end
+
+      def parse_content content, company
+        content ||= '1234'
+        company ||= '云片网'
+        "#code#=#{content}&#company#=#{company}"
+      end
+    end
+  end
+end
+

data/lib/china_sms/version.rb

@@ -1,3 +1,3 @@
 module ChinaSMS
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/service/smsbao_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe "Smsbao" do
+  let(:username) { 'saberma' }
+  let(:password) { '666666' }
   describe "#to" do
-    let(:username) { 'saberma' }
-    let(:password) { '666666' }
     let(:url) { "http://api.smsbao.com/sms" }
     let(:content) { '【短信宝测试】深圳 Rubyist 活动时间变更到明天下午 7:00，请留意。【19屋】' }
     subject { ChinaSMS::Service::Smsbao.to phone, content, username: username, password: password }
@@ -36,5 +36,25 @@ describe "Smsbao" do
       its([:code]) { should eql '0' }
       its([:message]) { should eql "短信发送成功" }
     end
+
+  end
+
+  describe "get" do
+    let(:remain_url) { "http://www.smsbao.com/query" }
+    subject { ChinaSMS::Service::Smsbao.get username: username, password: password }
+
+    describe "remain send count" do
+      before do
+        stub_request(:post, remain_url).
+          with(body: {u: username, p: Digest::MD5.hexdigest(password)}).
+          to_return(body: "0\n100,200")
+      end
+
+      its([:success]) { should eql true }
+      its([:code]) { should eql '0' }
+      its([:message]) { should eql '短信发送成功' }
+      its([:send]) { should eql 100 }
+      its([:remain]) { should eql 200 }
+    end
   end
 end

data/spec/service/yunpian_spec.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Yunpian" do
+  describe "#to" do
+    let(:apikey) { '2022b1599967a8cb788c05ddd9fc339e' }
+    let(:url) { "http://yunpian.com/v1/sms/tpl_send.json" }
+    let(:content) { '云片测试：验证码 1234。' }
+    subject { ChinaSMS::Service::Yunpian.to phone, content, password: apikey }
+
+    describe 'single phone' do
+      let(:phone) { '13928452841' }
+
+      before do
+        stub_request(:post, url).
+          with(
+            :body => {
+              "apikey" => apikey,
+              "mobile" => phone,
+              "tpl_id" => "2",
+              "tpl_value" =>"#code#=#{content}&#company#=云片网"},
+            :headers => {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }
+          ).
+          to_return(
+            body: {
+              'code' => 0,
+              'msg' => 'OK',
+              'result' => {
+                'count' => '1',
+                'fee' => '1',
+                'sid' => '592762800'
+              }
+            }.to_json
+          )
+      end
+
+      its(["code"]) { should eql 0 }
+      its(["msg"]) { should eql "OK" }
+    end
+
+    context 'invalid key' do
+      let(:phone) { '13928452841' }
+      let(:apikey) { '666666' }
+
+      before do
+        stub_request(:post, url).
+          with(
+            :body => {
+              "apikey"    => apikey,
+              "mobile"    => phone,
+              "tpl_id"    => "2",
+              "tpl_value" =>"#code#=#{content}&#company#=云片网"},
+            :headers => {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }
+          ).
+          to_return(
+            body: {
+              "code"   => -1,
+              "msg"    => "非法的apikey",
+              "detail" => "请检查的apikey是否正确"
+            }.to_json
+          )
+      end
+
+      its(["code"]) { should eql -1 }
+      its(["msg"]) { should eql "非法的apikey" }
+      its(["detail"]) { should eql "请检查的apikey是否正确" }
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: china_sms
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - saberma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,12 +85,14 @@ files:
 - lib/china_sms/service/emay.rb
 - lib/china_sms/service/smsbao.rb
 - lib/china_sms/service/tui3.rb
+- lib/china_sms/service/yunpian.rb
 - lib/china_sms/version.rb
 - spec/china_sms_spec.rb
 - spec/service/chanyoo_spec.rb
 - spec/service/emay_spec.rb
 - spec/service/smsbao_spec.rb
 - spec/service/tui3_spec.rb
+- spec/service/yunpian_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/saberma/china_sms
 licenses:
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: a gem for chinese people to send sms
@@ -122,4 +124,5 @@ test_files:
 - spec/service/emay_spec.rb
 - spec/service/smsbao_spec.rb
 - spec/service/tui3_spec.rb
+- spec/service/yunpian_spec.rb
 - spec/spec_helper.rb