xiaomipush 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc510fb762f7a870fc2f342abbb91c79b241a10
-  data.tar.gz: 83b228adaad2f3d99ab50aa1d49a61b5687f81b0
+  metadata.gz: 9e48479e9939e0d417747f7be63bb4bb3ccfcb8e
+  data.tar.gz: e716f4a66309356cb7781fd3db0853a7c5449609
 SHA512:
-  metadata.gz: d219e015a3248ab9660307faa2c4cf41c15ddb8bfd19f6fe59af5c26ff5c5cda49f3e6863ac8d91f3113ddc4c35a2fb1a782e4baa371e89efdbfdbb6ca9b5205
-  data.tar.gz: 6ce6af62bddc5a07316230acbd38653e33fb7415a6c30a757a9f4e46cb62bcc7061b4dd19f3ca8e88197e25f0964d5292f51afa297bc02c1402bf87ebdee73b2
+  metadata.gz: 2f154bfc9a36b4b25c9ef7f303bedc18cec07c32dd9aa792a48f5739d4ecfd115fd0d67bbb4f0bb66ea82f56839d2b92f17d0dfb403f05d3f0583345d9065d58
+  data.tar.gz: c9a916ec10e361f37fe01a8e83b04ee69a32b4c05ae3af82bbf9de8f659c5e56fa5412a2c93a95356bfdb9075ca5651fdb445acdbcb55a2de6f783ab7bce9c68

data/README.md

@@ -21,7 +21,39 @@ Or install it yourself as:
     $ gem install xiaomipush
 
 ## Usage
+```ruby
+Dir[File.dirname(__FILE__) + '/lib/*.rb'].each {|file| require file }
+@xiaomipush_service = Xiaomipush::Service.config do |s|
+  s.sandbox = false # default false
+  s.ios_secret = "ios secret key"
+  s.bundle_id = "com.xxx.ios"
+  s.android_secret = 'android secret key'
+  s.package_name = "io.mdrtwell.mipushdemo"
+  s.connection_adapter = :net_http # default
+end
+# just iOS
+@message1 = @xiaomipush_service.build(:ios, description: 'hello')
+@xiaomipush_service.push(:all, @message1)
+
+@message2 = @xiaomipush_service.build(:ios, description: 'hello alias', extra: {pid: 111})
+@xiaomipush_service.push(:alias, @message2, alias: '1043478')
+
+@message3 = @xiaomipush_service.build(:ios, description: 'hello topic', extra: {pid: 111})
+@xiaomipush_service.push(:topic, @message2, topic: 'all')
+
+#multi_topic
+@message3 = @xiaomipush_service.build(:ios, description: 'hello topic', extra: {pid: 111})
+@xiaomipush_service.push(:topics, @message2, topics: ['all', "other"])
+
+# iOS and Android
+@message3 = @xiaomipush_service.build(:both, title: "I'm title", description: 'push to iOS and Android client')
+@xiaomipush_service.push(:all, @message3)
+
+#user_account (推送到指定用户id格式为单个"1234"，多个"1234,12345,123456")
+handle_message = @xiaomipush_service.build(:android, title: "【你好测试", description: "测试", notify_id: 0, :pass_through => "jsdnnsd", extra:{notify_effect: 1, intent_uri: 'com.test.SplashActivity'})
+result = @xiaomipush_service.push(:user_account, handle_message, user_account: "123456")
 
+```
 TODO: Write usage instructions here
 
 ## Development
@@ -32,5 +64,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/xiaomipush.
+Bug reports and pull requests are welcome on GitHub at https://github.com/guoyoujin/xiaomipush.
 

data/lib/xiaomipush.rb

@@ -1,13 +1,13 @@
-require './lib/xiaomipush/xm_resources'
-require './lib/xiaomipush/http_base'
-require './lib/xiaomipush/message'
-require './lib/xiaomipush/android_builder'
-require './lib/xiaomipush/ios_builder'
-require './lib/xiaomipush/targeted_message'
-require './lib/xiaomipush/stats'
-require './lib/xiaomipush/subscription'
-require './lib/xiaomipush/tracer'
-require './lib/xiaomipush/feedback'
+require 'xiaomipush/xm_resources'
+require 'xiaomipush/http_base'
+require 'xiaomipush/message'
+require 'xiaomipush/android_builder'
+require 'xiaomipush/ios_builder'
+require 'xiaomipush/targeted_message'
+require 'xiaomipush/stats'
+require 'xiaomipush/subscription'
+require 'xiaomipush/tracer'
+require 'xiaomipush/feedback'
 
 module Xiaomipush
   class Service

data/lib/xiaomipush/android_builder.rb

@@ -0,0 +1,44 @@
+module Xiaomipush
+  class AndroidBuilder < Message
+
+    # 设置通知类型
+    NOTIFY_TYPE_DEFAULT_ALL     = -1
+    NOTIFY_TYPE_DEFAULT_SOUND   = 1 # 使用默认提示音提示
+    NOTIFY_TYPE_DEFAULT_VIBRATE = 2 # 使用默认震动提示
+    NOTIFY_TYPE_DEFAULT_LIGHTS  = 4 # 使用默认led灯光提示
+
+    NTF_CENTER_NTF   = 0 # 通知栏消息
+    PASS_THROUGH_NTF = 1 # 透传消息
+
+    attr_accessor :pass_through, :notify_id, :sound_url
+
+    def initialize(**message)
+      super(message)
+      puts "======> send push message====>: #{message.inspect}"
+      extra = message.delete(:extra) if message[:extra]
+      @pass_through = message[:pass_through] || NTF_CENTER_NTF
+      @notify_id = message[:notify_id] || 0
+      @notify_type  = message[:notify_type] || NOTIFY_TYPE_DEFAULT_ALL
+      extra_message = {sound_url: ""}
+      extra_message.merge!(extra) if extra
+      @extra = extra_message
+    end
+
+    def build
+      extra_message = extra(@extra) if @extra
+      message = {
+        payload: @payload,
+        title: @title,
+        notify_id: @notify_id,
+        pass_through: @pass_through,
+        notify_type: @notify_type,
+        restricted_package_name: @restricted_package_name,
+        description: @description
+      }
+      message.merge!(extra_message)
+      puts "======> send push message_merge====>: #{message.inspect}"
+      return message
+    end
+
+  end
+end

data/lib/xiaomipush/feedback.rb

@@ -0,0 +1,5 @@
+module Xiaomipush
+  class Feedback < HttpBase
+
+  end
+end

data/lib/xiaomipush/http_base.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+require 'faraday'
+
+module Xiaomipush
+  class HttpBase
+    attr_accessor :secret_key, :url, :host
+
+    def initialize(host="", secret_key="", connection_adapter = :net_http, headers={})
+      @host = host
+      @secret_key = secret_key
+      @connection_adapter = connection_adapter
+      @headers = headers
+    end
+
+    def post(url, body={});  conn.post url, body end
+    def get(url, params={}); conn.get url, params end
+
+    def conn
+      headers = {authorization: "key=#{@secret_key}"}.merge(@headers)
+      Faraday.new(:url => @host, :headers => headers) do |faraday|
+        faraday.request  :url_encoded
+        # faraday.response :logger
+        faraday.options.timeout = 5           # open/read timeout in seconds
+        faraday.options.open_timeout = 2      # connection open timeout in seconds
+        faraday.adapter  @connection_adapter 
+      end
+    end
+
+  end
+end

data/lib/xiaomipush/ios_builder.rb

@@ -0,0 +1,24 @@
+module Xiaomipush
+  class IosBuilder < Message
+    attr_accessor :sound_url, :badge
+
+    def initialize(**message)
+      super(message)
+      extra = message.delete(:extra) if message[:extra]
+      extra_message = {sound_url: "", badge: 1}
+      extra_message.merge!(extra) if extra
+      @extra = extra_message
+    end
+
+    def build
+      extra_message = extra(@extra) if @extra
+      message = {
+        restricted_package_name: @restricted_package_name,
+        description: @description
+      }
+      message.merge!(extra_message)
+      return message
+    end
+
+  end
+end

data/lib/xiaomipush/message.rb

@@ -0,0 +1,25 @@
+module Xiaomipush
+  class Message
+    EXTRA_PREFIX = 'extra.'
+    attr_accessor :payload, :title, :description, :time_to_live, :time_to_send, :extra, :notify_type, :restricted_package_name
+
+    # ws add
+    # pass_through: ''    notify_id: 0
+    def initialize(payload: "", restricted_package_name: "", title: "", description: "", time_to_live: "", time_to_send: "", extra: "", notify_type: "", pass_through: '', notify_id: 0)
+      @payload = payload
+      @restricted_package_name = restricted_package_name
+      @title = title
+      @description = description
+      @time_to_live = time_to_live
+      @time_to_send = time_to_send
+      @extra = extra
+      @notify_type = notify_type
+    end
+
+    def extra(options={})
+      options.keys.inject({}) do |h, key|
+        h["#{EXTRA_PREFIX}#{key}"] = options.delete(key); h
+      end
+    end
+  end
+end

data/lib/xiaomipush/stats.rb

@@ -0,0 +1,5 @@
+module Xiaomipush
+  class Stats < HttpBase
+
+  end
+end

data/lib/xiaomipush/subscription.rb

@@ -0,0 +1,5 @@
+module Xiaomipush
+  class Subscription < HttpBase
+
+  end
+end

data/lib/xiaomipush/targeted_message.rb

@@ -0,0 +1,5 @@
+module Xiaomipush
+  class TargetedMessage < Message
+
+  end
+end

data/lib/xiaomipush/tracer.rb

@@ -0,0 +1,5 @@
+module Xiaomipush
+  class Tracer < HttpBase
+
+  end
+end

data/lib/xiaomipush/version.rb

@@ -1,3 +1,3 @@
 module Xiaomipush
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/xiaomipush/xm_resources.rb

@@ -0,0 +1,38 @@
+module Xiaomipush
+  class XmResource
+
+    # Xiaomipush::XmResource::OFFICIAL_DOMAIN
+
+    OFFICIAL_DOMAIN = "https://api.xmpush.xiaomi.com"
+    SANDBOX_DOMAIN = "https://sandbox.xmpush.xiaomi.com"
+    REG_URL = "/v2/message/regid"
+    ALIAS_URL = "/v2/message/alias"
+    TOPIC_URL = "/v2/message/topic"
+    MTOPIC_URL = "/v2/message/multi_topic"
+
+    # ws add
+    USER_ACCOUNT_URL = "/v2/message/user_account"
+
+    ALL_URL = "/v2/message/all"
+
+    SUBSCRIBE_URL= "/v2/topic/subscribe"
+    UNSUBSCRIBE_URL = "/v2/topic/unsubscribe"
+
+    MMREG_URL = "/v2/multi_messages/regids"
+    MMALIAS_URL = "/v2/multi_messages/aliases"
+
+    STATS_URL = '/v1/stats/message/counters'
+    TRACE_URL = '/v1/trace/message/status'
+    TRACES_URL = '/v1/trace/messages/status'
+    VALIDATE_REGIDS = '/v1/validation/regids'
+
+
+    FETCH_INVALID_REGIDS_URL = "https://feedback.xmpush.xiaomi.com/v1/feedback/fetch_invalid_regids"
+
+    UNION = 'UNION'
+    INTERSECTION = 'INTERSECTION'
+    EXCEPT = 'EXCEPT'
+
+
+  end
+end

data/test.rb

@@ -0,0 +1,32 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+Dir[File.dirname(__FILE__) + '/lib/*.rb'].each {|file| require file }
+@xiaomipush_service = Xiaomipush::Service.config do |s|
+  s.sandbox = false # default false
+  s.ios_secret = "ios secret key"
+  s.bundle_id = "com.xxx.ios"
+  s.android_secret = 'android secret key'
+  s.package_name = "io.mdrtwell.mipushdemo"
+  s.connection_adapter = :net_http # default
+end
+# just iOS
+@message1 = @xiaomipush_service.build(:ios, description: 'hello')
+@xiaomipush_service.push(:all, @message1)
+
+@message2 = @xiaomipush_service.build(:ios, description: 'hello alias', extra: {pid: 111})
+@xiaomipush_service.push(:alias, @message2, alias: '1043478')
+
+@message3 = @xiaomipush_service.build(:ios, description: 'hello topic', extra: {pid: 111})
+@xiaomipush_service.push(:topic, @message2, topic: 'all')
+
+#multi_topic
+@message3 = @xiaomipush_service.build(:ios, description: 'hello topic', extra: {pid: 111})
+@xiaomipush_service.push(:topics, @message2, topics: ['all', "other"])
+
+# iOS and Android
+@message3 = @xiaomipush_service.build(:both, title: "I'm title", description: 'push to iOS and Android client')
+@xiaomipush_service.push(:all, @message3)
+
+#user_account (推送到指定用户id格式为单个"1234"，多个"1234,12345,123456")
+handle_message = @xiaomipush_service.build(:android, title: "【你好测试", description: "测试", notify_id: 0, :pass_through => "jsdnnsd", extra:{notify_effect: 1, intent_uri: 'com.test.SplashActivity'})
+result = @xiaomipush_service.push(:user_account, handle_message, user_account: "123456")

data/xiaomipush.gemspec

@@ -12,21 +12,11 @@ Gem::Specification.new do |spec|
   spec.description   = %q{XiaoMi push Ruby Server SDK}
   spec.homepage      = "https://github.com/guoyoujin/xiaomipush"
   spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency 'faraday'
-  spec.add_runtime_dependency 'http'
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xiaomipush
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - trycatch
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,18 @@ files:
 - bin/console
 - bin/setup
 - lib/xiaomipush.rb
+- lib/xiaomipush/android_builder.rb
+- lib/xiaomipush/feedback.rb
+- lib/xiaomipush/http_base.rb
+- lib/xiaomipush/ios_builder.rb
+- lib/xiaomipush/message.rb
+- lib/xiaomipush/stats.rb
+- lib/xiaomipush/subscription.rb
+- lib/xiaomipush/targeted_message.rb
+- lib/xiaomipush/tracer.rb
 - lib/xiaomipush/version.rb
+- lib/xiaomipush/xm_resources.rb
+- test.rb
 - xiaomipush.gemspec
 homepage: https://github.com/guoyoujin/xiaomipush
 licenses: