yunpiansms 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beabd58086a4a4e5116caeb1407f306760ef07bd
-  data.tar.gz: 386e12ba0ccaf85f6a765a21f0e3bca8092b7a70
+  metadata.gz: d07991ac6a8551791386d66526a5fe87c7eda48a
+  data.tar.gz: 81e6e676b08af92f85e45656a621a26dd7e89316
 SHA512:
-  metadata.gz: fc2ad764a4ffe63d5b4c31817204ddd924428e59479eed1d2efbb0495b884185c4497b5096027b3794b28a87fb70bd11916b370657ae177df00c1838febc9237
-  data.tar.gz: 0375d6e367e096b3c8b865565a62c1d4e2e9d47d6172c2b4c0c32b4b4a58e064df4cbfe8d3346c9165968b0bf14b2a046f1876702a7562fc42cd1dc517db3827
+  metadata.gz: 0835e5dd6584c23161bf4b54cc4fb5f956b4e196419e7b0529183d604d3cfa1704d20491f6a1eb3073af9ae873cf12f99e6d38ec0fdc0e9a1e07bc6ae8d07ab2
+  data.tar.gz: 6496b50d9f87063129147232ddd850a851d31d7adf0ded6832944eec6a5d334e6a9340d27354f70c953dfcd437aca11a72bbe6519517ac6605a2986454d7f020

data/lib/yunpiansms/version.rb

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

data/lib/yunpiansms.rb

@@ -5,11 +5,10 @@ require 'yunpiansms/http_base'
 
 module Yunpiansms
   class Service
-    attr_accessor :apikey, :signature, :connection_adapter,:debug_flg
+    attr_accessor :apikey, :connection_adapter,:debug_flg
 
-    def initialize(apikey: "", signature: "", connection_adapter: :net_http, debug_flg: false)
+    def initialize(apikey: "", connection_adapter: :net_http, debug_flg: false)
       @apikey = apikey
-      @signature = signature
       @connection_adapter = connection_adapter
       @debug_flg = debug_flg
     end
@@ -18,26 +17,26 @@ module Yunpiansms
       yield service = new; service
     end
 
-    def send_to(content, mobiles = nil, signature = nil)
-      http.post(Yunpiansms::SmsResources::SEND_URL,params_data(content, mobiles , signature))
+    def send_to(content, mobiles = nil)
+      http.post(Yunpiansms::SmsResources::SEND_URL,params_data(content, mobiles))
     end
 
-    def tpl_send_to(content, mobiles = nil, tpl_id = nil, tpl_value=nil, signature = nil)
-      http.post(Yunpiansms::SmsResources::TPL_SEND_URL,params_data_tpl(content, mobiles, tpl_id,tpl_value,signature))
+    def tpl_send_to(content, mobiles = nil, tpl_id = nil, tpl_value=nil)
+      http.post(Yunpiansms::SmsResources::TPL_SEND_URL,params_data_tpl(content, mobiles, tpl_id,tpl_value))
     end
 
     private
 
-    def params_data(content, mobiles, signature = nil)
+    def params_data(content, mobiles)
       content          = format_content(content,mobiles)
-      content[:text]   = "#{signature || @signature}#{content[:text]}"
+      content[:text]   = "#{format_tpl_value(content[:text])}"
       content
     end
 
-    def params_data_tpl(content, mobiles = nil, tpl_id = nil, tpl_value=nil, signature = nil)
+    def params_data_tpl(content, mobiles = nil, tpl_id = nil, tpl_value=nil)
       content               = format_content(content,mobiles)
       content[:tpl_id]      = tpl_id || content.detele(:tpl_id)
-      content[:tpl_value]   = "#{signature || @signature}#{content[:text]}"
+      content[:tpl_value]   = "#{format_tpl_value(content[:tpl_value])}"
       content
     end
 
@@ -63,5 +62,17 @@ module Yunpiansms
       params[:mobile] = mobile_format(mobiles || params[:mobile])
       params
     end
+
+    def format_tpl_value(tpl_value)
+      if tpl_value.is_a?(Hash)
+        tpl_value = parse_tpl_value(tpl_value)
+      else
+        tpl_value
+      end
+    end
+
+    def parse_tpl_value tpl_value
+      tpl_value.map { |k, v| "##{k}#=#{v}" }.join('&')
+    end
   end
 end

data/test.rb

@@ -3,13 +3,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Dir[File.dirname(__FILE__) + '/lib/*.rb'].each {|file| require file }
 @yunpiansms_service = Yunpiansms::Service.config do |s|
   s.apikey             = ""
-  s.signature          = "TryCatch"
   s.connection_adapter = :net_http # default
 end
 content = {
   apikey: "",
-  mobile: "15279058411",
-  text:   "测试一下短信发送",
+  mobile: "",
+  text:   "123",
   uid:    "15279"
 }
-result = @yunpiansms_service.send_to(content,"15279058411")
+result = @yunpiansms_service.send_to(content,"")
+content = {
+  apikey: "",
+  mobile: "",
+  tpl_value:   {key:"1245",key1:"23"},
+  uid:    "15279"
+}
+result = @yunpiansms_service.tpl_send_to(content,"",1,nil)
+content = {
+  apikey: "",
+  mobile: "",
+  text:   {key:"1245",key1:"23"},
+  uid:    "15279"
+}
+result = @yunpiansms_service.send_to(content,"")

data/yunpiansms.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["guoyoujin123@gmail.com"]
   spec.summary       = ["trycatch"]
   spec.description   = %q{yunpian send sms Ruby Server SDK.}
-  spec.homepage      = "https://github.com/guoyoujin/xiaomipush."
+  spec.homepage      = "https://github.com/guoyoujin/yunpiansms"
   spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yunpiansms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - trycatch
@@ -71,7 +71,7 @@ files:
 - lib/yunpiansms/version.rb
 - test.rb
 - yunpiansms.gemspec
-homepage: https://github.com/guoyoujin/xiaomipush.
+homepage: https://github.com/guoyoujin/yunpiansms
 licenses:
 - MIT
 metadata: {}