china_sms 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e5ab2da8313d489fd637a216018f23eeb48110
-  data.tar.gz: eab26a7375d7cd5cc2d3c1fcd3f366f8c790760e
+  metadata.gz: 5e5842aa72def89ea1a2a8300b95301d35337d0a
+  data.tar.gz: 5e7ff2e05f50124f63d2cf91eb6d30323b13fefa
 SHA512:
-  metadata.gz: 58907bb3cdbba273d491cf358faaedc0915681948510afdb411147cb5f680bfe83a1ff330bc2a53c2cca2ad98a50e4613cb274bba19b2217b1e84ca85636b90b
-  data.tar.gz: 386027184fd3f393239292976ce2932a7e7c4b0199e7db226de1747ceae812b8e9f2d0fea57ff81623becc332b92c98a2eaa1d8a06db2e25801a9051214c15a3
+  metadata.gz: ae1937ec1e79db7bbc5b7f1279e279593231a5c336777e1029c6f59bad67221df4f98f2e4f3af0244da0959681537d1676126b26442873d9b8a749b7e8d3eb8a
+  data.tar.gz: 660dba084b4c14d81e9a2d361881c1a4d569e042cc1ce5e8b0348a74286321804a5e3c38736a4d93b9b7b5b9802f3828bea0b9e7a98472bcd8e494a58d4a0b4d

data/README.md

@@ -35,12 +35,24 @@
 ChinaSMS.use :tui3, username: 'YOUR_USERNAME', password: 'YOUR_PASSWORD'
 ChinaSMS.to '13912345678', '[Test]China SMS gem has been released.'
 
-# :yunpian 的参数有
-#    :company    默认是 `云片网`
-#    :tpl_id     默认是 2
+
+# :yunpian
+#   如果content(第二个参数) 是字符串
+#     调用 通用接口 发送短信
+#   如果是 Hash
+#     调用 模板接口 发送短信
+#     可选参数：
+#       :tpl_id 默认是 2
 
 ChinaSMS.use :yunpian, password: 'YOUR_API_KEY'
-ChinaSMS.to '13912345678', '[Test]China SMS gem has been released.', company: '19Wu'
+
+# 通用接口
+ChinaSMS.to '13912345678', '[Test]China SMS gem has been released.'
+
+# 模板接口
+# 模板是 "您的验证码是#code#【#company#】”
+tpl_params = { code: 123, company: '19wu' }
+ChinaSMS.to '13912345678', tpl_params, tpl_id: 1
 
 ```
 

data/lib/china_sms.rb

@@ -19,7 +19,7 @@ module ChinaSMS
 
   def to(receiver, content, options = {})
     options = default_options.merge options
-    @service.to receiver, content.strip, options if @service
+    @service.to receiver, content, options if @service
   end
 
   def get(options = {})

data/lib/china_sms/service/yunpian.rb

@@ -4,22 +4,32 @@ module ChinaSMS
     module Yunpian
       extend self
 
-      URL     = "http://yunpian.com/v1/sms/tpl_send.json"
-      GET_URL = "http://yunpian.com/v1/sms/get.json"
+      GET_URL      = "http://yunpian.com/v1/sms/get.json"
+      SEND_URL     = 'http://yunpian.com/v1/sms/send.json'
+      TPL_SEND_URL = 'http://yunpian.com/v1/sms/tpl_send.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)
+        except! options, :username, :password
+
+        res = if content.is_a? Hash
+                message = parse_content content
+                options.merge!({ mobile: phone, tpl_value: message })
+                Net::HTTP.post_form(URI.parse(TPL_SEND_URL), options)
+              else
+                except! options, :tpl_id
+                message = content
+                options.merge!({ mobile: phone, text: message })
+                Net::HTTP.post_form(URI.parse(SEND_URL), options)
+              end
+
         result res.body
       end
 
       def get options = {}
         options[:apikey] ||= options[:password]
-        except! options, :username, :password, :company
+        except! options, :username, :password
         res = Net::HTTP.post_form(URI.parse(GET_URL), options)
         result res.body
       end
@@ -43,10 +53,8 @@ module ChinaSMS
         options
       end
 
-      def parse_content content, company
-        content ||= '1234'
-        company ||= '云片网'
-        "#code#=#{content}&#company#=#{company}"
+      def parse_content content
+        content.map { |k, v| "##{k}#=#{v}" }.join('&')
       end
     end
   end

data/lib/china_sms/version.rb

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

data/spec/service/yunpian_spec.rb

@@ -4,25 +4,25 @@ require 'spec_helper'
 describe "Yunpian" do
   describe "#to" do
     let(:apikey) { '2022b1599967a8cb788c05ddd9fc339e' }
-    let(:url) { "http://yunpian.com/v1/sms/tpl_send.json" }
+    let(:send_url) { "http://yunpian.com/v1/sms/send.json" }
+    let(:tpl_send_url) { "http://yunpian.com/v1/sms/tpl_send.json" }
     let(:content) { '云片测试：验证码 1234。' }
-    subject { ChinaSMS::Service::Yunpian.to phone, content, password: apikey }
+    let(:tpl_content) { Hash[:code, 123, :company, '云片网'] }
 
     describe 'single phone' do
       let(:phone) { '13928452841' }
 
       before do
-        stub_request(:post, url).
+        stub_request(:post, tpl_send_url).
           with(
-            :body => {
+            body: {
               "apikey" => apikey,
               "mobile" => phone,
               "tpl_id" => "2",
-              "tpl_value" =>"#code#=#{content}&#company#=云片网"},
-            :headers => {
+              "tpl_value" => "#code#=123&#company#=云片网" },
+            headers: {
               'Content-Type' => 'application/x-www-form-urlencoded'
-            }
-          ).
+            }).
           to_return(
             body: {
               'code' => 0,
@@ -34,28 +34,76 @@ describe "Yunpian" do
               }
             }.to_json
           )
+
+        stub_request(:post, send_url).
+          with(
+            body: {
+              "apikey" => apikey,
+              "mobile" => phone,
+              "text" => content },
+            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
+
+      context 'string content' do
+        subject { ChinaSMS::Service::Yunpian.to phone, content, password: apikey }
+
+        its(["code"]) { should eql 0 }
+        its(["msg"]) { should eql "OK" }
       end
 
-      its(["code"]) { should eql 0 }
-      its(["msg"]) { should eql "OK" }
+      context 'tpl content' do
+        subject { ChinaSMS::Service::Yunpian.to phone, tpl_content, password: apikey }
+
+        its(["code"]) { should eql 0 }
+        its(["msg"]) { should eql "OK" }
+      end
     end
 
-    context 'invalid key' do
+    describe 'invalid key' do
       let(:phone) { '13928452841' }
       let(:apikey) { '666666' }
 
       before do
-        stub_request(:post, url).
+        stub_request(:post, tpl_send_url).
           with(
-            :body => {
+            body: {
               "apikey"    => apikey,
               "mobile"    => phone,
               "tpl_id"    => "2",
-              "tpl_value" =>"#code#=#{content}&#company#=云片网"},
-            :headers => {
+              "tpl_value" => "#code#=123&#company#=云片网" },
+            headers: {
               'Content-Type' => 'application/x-www-form-urlencoded'
-            }
-          ).
+            }).
+          to_return(
+            body: {
+              "code"   => -1,
+              "msg"    => "非法的apikey",
+              "detail" => "请检查的apikey是否正确"
+            }.to_json
+          )
+
+        stub_request(:post, send_url).
+          with(
+            body: {
+              "apikey" => apikey,
+              "mobile" => phone,
+              "text" => content },
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }).
           to_return(
             body: {
               "code"   => -1,
@@ -65,9 +113,21 @@ describe "Yunpian" do
           )
       end
 
-      its(["code"]) { should eql -1 }
-      its(["msg"]) { should eql "非法的apikey" }
-      its(["detail"]) { should eql "请检查的apikey是否正确" }
+      context 'string content' do
+        subject { ChinaSMS::Service::Yunpian.to phone, content, password: apikey }
+
+        its(["code"]) { should eql -1 }
+        its(["msg"]) { should eql "非法的apikey" }
+        its(["detail"]) { should eql "请检查的apikey是否正确" }
+      end
+
+      context 'tpl content' do
+        subject { ChinaSMS::Service::Yunpian.to phone, tpl_content, password: apikey }
+
+        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.6
+  version: 0.0.7
 platform: ruby
 authors:
 - saberma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: a gem for chinese people to send sms