Baidupush 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eec366eb925647d38fd6128f85812cc9941719e
-  data.tar.gz: 7810c6e59f2a9dc6330e4e3cbb75966f2352f170
+  metadata.gz: fc1ff5eb3d193b3b3cb91cbbc4c0028ef864f72e
+  data.tar.gz: 8f10829d54e0c16e3109bc929def023e7b66de88
 SHA512:
-  metadata.gz: 43fa223edbae80da52f30f656e7685267253950c27db450c123857151c25767079a6d83aefd7982c6ff3f0b9189870d99a7e69a1b4d90e98c95657a3cbdfcfd6
-  data.tar.gz: 4047a487462e08a957c31350f124f713a0daff0750d16b12ff97da3eb8a54fe540d9bcfc347c3a3bc39e84fdf3209cf39a2dd548bd2cc364fd5701a5bde74d47
+  metadata.gz: b982f1208fbd593540534c051975f1ac2d6de926c7448e5f74f18403197e8f887a07897663befaa77ea6efd41187b12a19e5fc54e1512f2cfda37e8f2d9f7304
+  data.tar.gz: d94edb06c53ae190d979c58e1d90d2a26afce34d397b7d961064ab694d38c30049391770c97c2fa1f005bed5b1be0e786cd2de2c52ea4363d258e7a789019739

data/lib/Baidupush/base.rb

@@ -34,9 +34,9 @@ module Baidupush
         str += "#{key}=#{params[key]}"
       end
       str += "#{secertkey}"
-      p "**STR:#{str}"
+      #p "**STR:#{str}"
       str = CGI::escape(str)
-      p "**Str: #{str}"
+      #p "**Str: #{str}"
       sign = Digest::MD5.hexdigest(str)
       sign
     end
@@ -70,7 +70,6 @@ module Baidupush
     def self.http_get(url,args)
       uri = URI.parse(url)
       uri.query = URI.encode_www_form(args)
-      p "URL : #{uri}"
       http = Net::HTTP.new(uri.host, uri.port)
       request = Net::HTTP::Get.new(uri.request_uri)
       time_start = Time.now.to_i

data/lib/Baidupush/{api.rb → push_notice.rb}

@@ -4,7 +4,7 @@ require "#{File.dirname(__FILE__)}/base"
 require 'securerandom'
 
 module Baidupush
-  class Api
+  class PushNotice
     # To change this template use File | Settings | File Templates.
 
     HTTP_METHOD_POST = "POST"
@@ -159,10 +159,6 @@ module Baidupush
       push_config
     end
 
-    def push_msg_ios(options={})
-
-    end
-
 
     #"title" : "hello" ,
     #    “description: "hello world"
@@ -184,9 +180,20 @@ module Baidupush
         params.merge!({key.to_s=>value})
       end
       params.merge!("custom_content"=>custom_content)
+      #p "Android_msg: #{params}"
       params
     end
 
+    def get_ios_msg(msg,options={})
+      options = _params_default(options,DEFAULT_IOS_FIELD)
+      if msg.class!=Hash
+        raise RuntimeError,"推送苹果的消息应为Hash"
+      end
+      params = {:aps=>options}
+      msg.each do |key,value|
+        params.merge!(key=>value)
+      end
+    end
 
     #options:
     #method	string	是	方法名，必须存在：push_msg。
@@ -223,6 +230,16 @@ module Baidupush
       request_server(options)
     end
 
+
+    #deploy_status: 1:开发 2：生产
+    def push_msg_ios(send_ios_msg,options={})
+      options = _params_default(options,DEFAULT_REQUREST_BAIDU_METHOD)
+      options = _params_default(options,DEFAULT_PUSH_CONFIG)
+      options[:msg_keys] = Time.now.to_i.to_s + ::SecureRandom.uuid.gsub!("-","")
+      options.merge!(:messages => send_ios_msg)
+      request_server(options)
+    end
+
     #---------推送相关函数------------END-------------------------------------------
 
 
@@ -268,8 +285,8 @@ module Baidupush
     #类初始值
     DEFAULT_API = {
         :name => "测试应用",
-        :secret_key => "7rWFgwXsECVcIzZ2jz5O9Zcy61CCkh6o",
-        :api_key => "e9s6PNT5aTAwysl2D46c8HM4",
+        :secret_key => "7RmGeGbCmzwfWmrtQKtXb3q28p3IlhH3",
+        :api_key => "GVdWkcfOcAYNODhqWPPooQT6",
         :url => "http://channel.api.duapp.com/rest/2.0/channel/channel",
     }
 
@@ -301,6 +318,14 @@ module Baidupush
         :pkg_version=>"0.1",
     }
 
+
+    #apple的推送消息初始化设置
+    DEFAULT_IOS_FIELD = {
+        :alert=>"Message From Baidu Push",
+        :Sound=>"",
+        :Badge=>0
+    }
+
     #推送类型函数的初始化设置
     DEFAULT_PUSH_CONFIG = {
         :method => "push_msg",

data/lib/Baidupush/sa

@@ -0,0 +1,11 @@
+POSThttp://channel.api.duapp.com/rest/2.0/channel/channelapikey=AIgqItcV8tHLwfnO72QSBn9cchannel_id=11111111111device_type=3message_type=0messages=Hello Channelmethod=push_msgmsg_keys=channel_msg_keypush_type=1timestamp=1381817628user_id=1111111111111kckoI6PGF3FMhdA7mLjpGLi5Ukuedm91
+POSThttp://channel.api.duapp.com/rest/2.0/channel/channelapikey=AIgqItcV8tHLwfnO72QSBn9cchannel_id=11111111111device_type=3message_type=0messages=Hello Channelmethod=push_msgmsg_keys=channel_msg_keypush_type=1timestamp=1381817628user_id=1111111111111kckoI6PGF3FMhdA7mLjpGLi5Ukuedm91
+
+
+POSThttp%3A%2F%2Fchannel.api.duapp.com%2Frest%2F2.0%2Fchannel%2Fchannelapikey%3DAIgqItcV8tHLwfnO72QSBn9cchannel_id%3D11111111111device_type%3D3message_type%3D0messages%3DHello+Channelmethod%3Dpush_msgmsg_keys%3Dchannel_msg_keypush_type%3D1timestamp%3D1381817628user_id%3D1111111111111kckoI6PGF3FMhdA7mLjpGLi5Ukuedm91
+
+
+
+
+8c7879008203e18e0898af7a7d1e6ad2
+1e7d1022f004788f8e2e6ea7a39725e1

data/lib/Baidupush/version.rb

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

data/lib/rails/generators/Baidupush/config/config_generator.rb

@@ -6,7 +6,7 @@ module Baidupush
     class ConfigGenerator < Rails::Generators::Base
       desc "Creates a baidu_cloud_push configuration file at config/baidu_push.yml"
 
-      def create_config_file
+      def self.create_config_file
         template 'baidu_cloud_push.yml', File.join('config', 'baidu_cloud_push.yml')
       end
 

data/test/test_base.rb

@@ -0,0 +1,71 @@
+#encoding:utf-8
+
+require 'test/unit'
+require "#{File.dirname(__FILE__)}/../lib/Baidupush/base"
+require "#{File.dirname(__FILE__)}/../lib/Baidupush/push"
+
+class TestBase < Test::Unit::TestCase
+  # To change this template use File | Settings | File Templates.
+  include Baidupush
+
+  def test_api_query_bindlist
+    assert_block do
+      p "Request query bindlist"
+      api = PushNotice.new
+      ret = api.query_bindlist
+      p ret
+      ret
+    end
+  end
+
+  def test_send_msg_andriod
+    assert_block do
+      p  "Request Send msg andriod"
+      api = PushNotice.new
+      ret = api.push_msg_andriod(api.get_android_msg("测试","这是个测试",{"c1"=>1,"c2"=>2}))
+      p ret
+      ret
+    end
+  end
+
+  def test_send_msg_ios
+    assert_block do
+      p  "Request Send msg IOS"
+      api = PushNotice.new
+      ret = api.push_msg_andriod(api.get_ios_msg({"test"=>"这是个测试"},{:deploy_status=>1}))
+      p ret
+      ret
+    end
+  end
+
+  def test_set_tag
+    assert_block do
+      p "Requrest Set tag"
+      api = PushNotice.new
+      ret = api.tag_set
+      p ret
+      ret
+    end
+  end
+
+  def test_fetch_tag
+    assert_block do
+      p "Request Fetch tag"
+      api = PushNotice.new
+      ret = api.tag_fetch
+      p ret
+      ret
+    end
+  end
+
+ def test_delete_tag
+   assert_block do
+     p "Request Delete tag"
+     api = PushNotice.new
+     ret = api.tag_delete
+     p ret
+     ret
+   end
+ end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Baidupush
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - zql
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,12 +53,14 @@ files:
 - README.md
 - Rakefile
 - lib/Baidupush.rb
-- lib/Baidupush/api.rb
 - lib/Baidupush/base.rb
 - lib/Baidupush/base_error.rb
+- lib/Baidupush/push_notice.rb
+- lib/Baidupush/sa
 - lib/Baidupush/version.rb
 - lib/rails/generators/Baidupush/config/config_generator.rb
 - lib/rails/generators/Baidupush/config/templates/baidu_cloud_push.yml
+- test/test_base.rb
 homepage: ''
 licenses:
 - MIT
@@ -83,4 +85,5 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: 百度云推送
-test_files: []
+test_files:
+- test/test_base.rb