alipass 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d957ce0a1d111a4b89637cbf080700b1ba2e41d
-  data.tar.gz: 40c563d27c3ded9b0d6d69cd9b15eab345dfb73b
+  metadata.gz: 320943ac438d9afbd296d14f4044e9ce8725d63d
+  data.tar.gz: 44e5c649b7afabb6d404045e3dbfaf2ea754f591
 SHA512:
-  metadata.gz: 7906cf28810660ce05dd94ec1ee021e84f9b5ce435914d52fb00cf0a16ce44f6bc210a992aa015c6f083d4cb611815fee91891e9f47f3ea33c658a016f91e370
-  data.tar.gz: 108406fd6c981029a42ea7252896d6ae6e0a1067a8b473d9d92cbaa43cd61d1f033d6720eb4ba8f94b7d8b7b84989fe0084132d63e07a79e32d88e478f405ecc
+  metadata.gz: 7de3047c33a9f37538a464eac3a3581141f3157f0888a810ca96ac9bdd047dcac791342de32c3c21506bb225ab141f4ccdca1dcee3740251a61e9c925f1d551b
+  data.tar.gz: ec8e28fb745ba6d4dcf0d2944b69870aa29a10eae7ff7a40c55e9c1740fe540ef0e94a30a875aa104c66e8b9039b6ea259182d70a4b2cb99fdbcf8edc99aec72

data/README.md

@@ -34,7 +34,7 @@ Alipass::Template.add(
 )
 ```
 
-`tpl_content` 参数比较复杂，请参考[测试代码](https://github.com/HungYuHei/alipass/blob/master/spec/alipass/template_spec.rb)和[数据格式说明](https://openhome.alipay.com/doc/docIndex.htm?url=https://openhome.alipay.com/doc/viewKbDoc.htm?key=236698_261970&type=info)
+`tpl_content` 参数比较复杂，请参考 [测试代码](https://github.com/HungYuHei/alipass/blob/master/spec/alipass/template_spec.rb) 和 [数据格式说明](https://openhome.alipay.com/doc/docIndex.htm?url=https://openhome.alipay.com/doc/viewKbDoc.htm?key=236698_261970&type=info)
 
 ### 模版方式添加卡券
 
@@ -50,6 +50,7 @@ Alipass::Template::Content.add(
 ### Run test
 
 ```
+# Edit spec/spec_helper.rb
 rake test
 ```
 

data/lib/alipass/template.rb

@@ -2,7 +2,11 @@ require 'alipass/template/content'
 
 module Alipass
   module Template
-    # REQUIRED_PARAMS = [ :method, :timestamp, :app_id, :version, :sign, :sign_type, :tpl_content]
+
+    # REQUIRED_PARAMS = [
+    #   :method, :timestamp, :app_id, :version, :sign, :sign_type,
+    #   :tpl_content, :unique_id
+    # ]
 
     def self.add(params)
       gateway = 'https://openapi.alipay.com/gateway.do'
@@ -12,13 +16,12 @@ module Alipass
         format: 'json',
         app_id: Alipass.app_id,
         version: '1.0',
+        unique_id: SecureRandom.hex,
         sign_type: 'RSA'
       }.merge(params)
 
-      params[:tpl_content] = params[:tpl_content].encode('GBK') if params[:tpl_content]
-
-      sign = Sign.generate(params)
-      params.merge!(sign: sign)
+      params[:tpl_content].encode!('GBK', { invalid: :replace, undef: :replace, replace: '' })
+      params[:sign] = Sign.generate(params)
 
       RestClient.post(gateway, params) do |response|
         JSON.parse(response.body)

data/lib/alipass/template/content.rb

@@ -10,7 +10,6 @@ module Alipass
       #   :tpl_id, :tpl_params, :recognition_type, :recognition_info
       # ]
 
-      # tpl_id, tpl_params, recognition_type, recognition_info
       def self.add(params)
         gateway = 'https://openapi.alipay.com/gateway.do'
         params = {
@@ -22,10 +21,8 @@ module Alipass
           version: '1.0'
         }.merge(params)
 
-        params[:tpl_params] = params[:tpl_params].encode('GBK') if params[:tpl_params]
-
-        sign = Sign.generate(params)
-        params.merge!(sign: sign)
+        params[:tpl_params].encode!('GBK', { invalid: :replace, undef: :replace, replace: '' })
+        params[:sign] = Sign.generate(params)
 
         RestClient.post(gateway, params) do |response|
           JSON.parse(response.body)

data/lib/alipass/version.rb

@@ -1,3 +1,3 @@
 module Alipass
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/alipass/template/content_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe Alipass::Template::Content do
-  let(:body) do
-    %Q({"alipay_pass_tpl_add_response":{"success":"T","error_code":"SUCCESS","biz_result":{"serialNumber":"123555123","passId":"32770","result":"SUCCESS"}}})
-  end
-
   before do
     FakeWeb.register_uri(:post, 'https://openapi.alipay.com/gateway.do', body: body)
   end
@@ -12,12 +8,54 @@ describe Alipass::Template::Content do
   it ".add" do
     params = {
       tpl_id: 'tpl_id',
-      tpl_params: %Q({"title":"title","begin_at":"2014-11-11 00:11"}),
+      tpl_params: tpl_params.to_json,
       recognition_type: '1',
       recognition_info: %Q({"partner_id":"partner_id","out_trade_no":"out_trade_no"})
     }
 
-    json = Alipass::Template::Content.add(params)
-    json['alipay_pass_tpl_add_response']['biz_result']['result'].must_equal 'SUCCESS'
+    response = Alipass::Template::Content.add(params)
+    biz_result = response['alipay_pass_tpl_content_add_response']['biz_result']
+    biz_result.must_be_kind_of String
+
+    json = JSON.parse(biz_result)
+    json['passId'].wont_be_empty
+  end
+
+  let(:body) do
+    {
+      alipay_pass_tpl_content_add_response: {
+        biz_result: '{"passId":"passId","serialNumber":"serialNumber","result":"SUCCESS"}',
+        error_code: "SUCCESS",
+        success: true
+      },
+      sign: "sign"
+    }.to_json
+  end
+
+  let(:tpl_params) do
+    {
+      title: 'title',
+      begin_at: '2014-07-16 20:20:00',
+      end_at: '2014-07-17 23:20:00',
+      begin_at_date: "2014-07-15",
+      begin_at_time: "20:20",
+      scene: '场地名',
+      number: '110',
+      price: '0.02',
+      longitude: '116.407413',
+      latitude: '39.904214',
+      tel: '123456',
+      address: '场地名',
+      scene_name: 'SD',
+      qr_value: '123|321|123',
+      qr_tips: '刷这里啊',
+      app_tips: '启动 APP',
+      perf_url: 'http://youyanchu.com',
+      web_tips: '打开网页',
+      serial_number: 'serial_number',
+      channel_id: Alipass.app_id,
+      web_service_url: 'http://youyanchu.com',
+      background_color: 'rgb(165,22,40)'
+    }
   end
 end

data/spec/alipass/template_spec.rb

@@ -1,42 +1,51 @@
 require 'spec_helper'
 
 describe Alipass::Template do
-  let(:tpl_id) { 'test_tpl_id' }
-  let(:body) do
-    %Q({"alipay_pass_tpl_add_response":{"error_code":"SUCCESS", "result":{"tpl_id":"#{tpl_id}","tpl_params":[]}, "success":true}, "sign":"sign"})
-  end
-
   before do
     FakeWeb.register_uri(:post, 'https://openapi.alipay.com/gateway.do', body: body)
   end
 
   it ".add" do
     params = {
-      logo: 'logo_url',
-      strip: 'strip_url',
-      icon: 'icon_url',
+      logo: 'http://dn-dev.qbox.me/test/alipass-logo-test.png',
+      strip: '',
+      icon: '',
       content: pass_json
     }
 
-    json = Alipass::Template.add(tpl_content: params.to_json)
-    json['alipay_pass_tpl_add_response']['result']['tpl_id'].must_equal tpl_id
+    response = Alipass::Template.add(tpl_content: params.to_json)
+    result = response['alipay_pass_tpl_add_response']['result']
+    result.must_be_kind_of String
+
+    json = JSON.parse(result)
+    json['tpl_id'].wont_be_empty
+  end
+
+  let(:body) do
+    {
+      alipay_pass_tpl_add_response: {
+        result: '{"tpl_id":"tpl_id","tpl_params":["title", "begin_at"]}',
+        error_code: "SUCCESS",
+        success: true
+      },
+      sign: "sign"
+    }.to_json
   end
 
-  def pass_json
+  let(:pass_json) do
     {
       evoucherInfo: {
-        goodsId: "",
-        title: "$title",
+        title: "$title$",
         type: "eventTicket",
         product: "movie",
-        startDate: "$begin_at",
-        endDate: "$end_at",
+        startDate: "$begin_at$",
+        endDate: "$end_at$",
         operation: [
           {
             format: "qrcode",
-            message: "$qr_value",
+            message: "$qr_value$",
             messageEncoding: "utf-8",
-            altText: "$qr_tips"
+            altText: "$qr_tips$"
           },
           {
             message: {
@@ -44,39 +53,58 @@ describe Alipass::Template do
               android_launch: "schemes://com.youyanchu.android",
               android_download: "http://youyanchu.com/l/app/android",
               ios_appid: "com.youyanchu.iphone.showtime",
-              ios_launch: "schemes://com.youyanchu.iphone.showtime",
+              ios_launch: "youyanchuiphone://",
               ios_download: "http://youyanchu.com/l/app/ios"
             },
             format: "app",
             messageEncoding: "utf-8",
-            altText: "$app_tips"
+            altText: "$app_tips$"
           },
           {
             format: "url",
-            message: "$perf_url",
+            message: "$perf_url$",
             messageEncoding: "utf-8",
-            altText: "$web_tips"
+            altText: "$web_tips$"
           }
         ],
         einfo: {
-          logoText: "$title",
-          headFields: [{key: "begin_at_date", label: "日期", value: "$begin_at_date", type: "text"}],
-          primaryFields: [{key: "begin_at_time", label: "演出时间", value: "$begin_at_time", type: "text"}],
-          secondaryFields: [{key: "scene", label: "场地", value: "$scene", type: "map"}],
-          auxiliaryFields: [{key: "number", label: "票号", value: "$number", type: "text"}, {key: "price", label: "金额", value: "$price", type: "text"}],
+          logoText: "$title$",
+          headFields: [{ key: "begin_at_date", label: "日期", value: "$begin_at_date$", type: "text" }],
+          primaryFields: [{ key: "begin_at_time", label: "演出时间", value: "$begin_at_time$", type: "text" }],
+          secondaryFields: [{ key: "scene", label: "场地", value: "$scene$", type: "map" }],
+          auxiliaryFields: [
+            { key: "number", label: "票号", value: "$number$", type: "text" },
+            { key: "price", label: "金额", value: "$price$", type: "text" }
+          ],
           backFields: []
         },
-        locations: [{altitude: "", longitude: "$longitude", latitude: "$latitude", tel: "$tel", addr: "$address", relevantText: "$scene_name"}]
+        locations: [
+          {
+            altitude: "",
+            longitude: "$longitude$",
+            latitude: "$latitude$",
+            tel: "$tel$",
+            addr: "$address$",
+            relevantText: "$scene_name$"
+          }
+        ]
       }, # evoucherInfo
 
-      merchant: {mname: "xxx有限公司", mtel: "123456789", minfo: ""},
-      platform: {channelID: "$channel_id", webServiceUrl: "$web_service_url"},
-      style: {backgroundColor: "$background_color"},
+      merchant: { mname: "xxx有限公司", mtel: "123456789", minfo: "" },
+      platform: { channelID: "$channel_id$", webServiceUrl: "$web_service_url$" },
+      style: { backgroundColor: "$background_color$" },
 
-      fileInfo: {formatVersion: "2", canShare: true, canBuy: false, serialNumber: "$serial_number"},
+      fileInfo: { formatVersion: "2", canShare: false, canBuy: false, serialNumber: "$serial_number$" },
 
       appInfo: {
-        app: {android_appid: "com.youyanchu.android", android_launch: "schemes://com.youyanchu.android", android_download: "http://youyanchu.com/l/app/android", ios_appid: "com.youyanchu.iphone.showtime", ios_launch: "schemes://com.youyanchu.iphone.showtime", ios_download: "http://youyanchu.com/l/app/ios"},
+        app: {
+          android_appid: "com.youyanchu.android",
+          android_launch: "schemes://com.youyanchu.android",
+          android_download: "http://youyanchu.com/l/app/android",
+          ios_appid: "com.youyanchu.iphone.showtime",
+          ios_launch: "youyanchuiphone://",
+          ios_download: "http://youyanchu.com/l/app/ios"
+        },
         label: "有演出",
         message: "音乐演出神器"
       },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipass
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - HungYuHei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client