xiaomi-push 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4e4e4b7206faa062c6cdff0317ce6674ea592b4
-  data.tar.gz: a2897ab8748cf253814c4d6af1f6d57648ff32f1
+  metadata.gz: 596215b9db023ba5ed57ecdb279b08227b7c181d
+  data.tar.gz: d404409f70e5b628360cb926ba0229cff4a2a10e
 SHA512:
-  metadata.gz: cd77e0742cc5f77551e6944075a5ad28378f37788b309db01a24dda27be99e08fac2bec8c60b9f566cdf6359b8c2b197a2891d4a256f819b5090ca0fc0690502
-  data.tar.gz: de4b39e37ab848e9af9799cb6820937a1fd9438d52151f4c6ea1ce9858d9bf694344dcfdeccbe24d03c5ff6ee63b6ef0ba5d6cfbc7f2366343aa949c7e67df42
+  metadata.gz: 2c5ca54678cff7b74bbc93d8c9d8a90c9de3d7c1c61999caca6425f0dc299023766456a39e5de5af2da691e6e2c8cd5178c73f2e748a2dc0787fcff86dafea72
+  data.tar.gz: 99cf5f458eb925cea7b54e09fe411d648dfcee67ce5f041579383bc6c65be04b789ea0b7622251962b0be9fbdb2003efb5aac780b9662c4f39f64d7949cc8c11

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+# source 'https://gems.ruby-china.org'
 
 # Specify your gem's dependencies in xiaomi-push.gemspec
 gemspec

data/README.md

@@ -1,6 +1,8 @@
 非官方小米推送服务端 Ruby SDK
 =============================
 
+> 小米官方好像也就不怎么维护此服务，本 gem 除了修复问题以为不做新特性的更新。
+
 官方文档: http://dev.xiaomi.com/doc/?p=533#d5e725
 
 TL;DR

data/Rakefile

@@ -1,7 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'dotenv/tasks'
-require 'awesome_print'
 
 # $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
@@ -9,49 +8,49 @@ require 'xiaomi/push'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-
-task :send => :dotenv do
+task default: :spec
 
+task send: :dotenv do
   message = {
     title: '这是标题',
     description: '这个是推送的描述',
-    notify_type: -1,
+    notify_type: -1
   }
+
   client = Xiaomi::Push::Android.new(ENV['XIAOMI_PUSH_ANDROID_SECRET'])
 
-  p "Send message to android device"
-  client.message.send(reg_id:'', message:message)
-  r = client.message.send(alias:'866383029998732', message:message)
-  r = client.message.send(topic:'test', message:message)
-  ap r
+  p 'Send message to android device'
+  client.message.send(reg_id: '', message: message)
+  r = client.message.send(alias: '866383029998732', message: message)
+  r = client.message.send(topic: 'test', message: message)
+  puts r
 
-  p "Send message to ios device"
+  p 'Send message to ios device'
   client = Xiaomi::Push::IOS.new(ENV['XIAOMI_PUSH_IOS_SECRET'])
   r = client.message.send(
-    reg_id:'xksdf76s667687xd786sdxsdf689s6x6s8d76s8d',
-    message:Xiaomi::Push::Message::IOS.new(
-      description:'这不是描述'
+    reg_id: 'xksdf76s667687xd786sdxsdf689s6x6s8d76s8d',
+    message: Xiaomi::Push::Message::IOS.new(
+      description: '这不是描述'
   ))
-  ap r
+  puts r
 end
 
 namespace :topic do
-  task :subscribe => :dotenv do
+  task subscribe: :dotenv do
     client = Xiaomi::Push::Android.new(ENV['XIAOMI_PUSH_ANDROID_SECRET'])
-    r = client.topic.subscribe(alias:'866383029998732', name:'test')
+    r = client.topic.subscribe(alias: '866383029998732', name: 'test')
     ap r
   end
 
-  task :unsubscribe => :dotenv do
+  task unsubscribe: :dotenv do
     client = Xiaomi::Push::Android.new(ENV['XIAOMI_PUSH_ANDROID_SECRET'])
-    r = client.topic.unsubscribe(alias:'866383029998732', name:'test')
+    r = client.topic.unsubscribe(alias: '866383029998732', name: 'test')
     ap r
   end
 end
 
 task :message do
-  ios_message = Xiaomi::Push::Message::IOS.new(title:'dddd')
+  ios_message = Xiaomi::Push::Message::IOS.new(title: 'dddd')
   ios_message.extra('url', 'http://www.xxx.com')
   p ios_message
 
@@ -61,5 +60,5 @@ end
 task :feedback do
   client = Xiaomi::Push::Android.new(ENV['XIAOMI_PUSH_ANDROID_SECRET'])
   r = client.feedback.invalid
-  ap r
+  puts r
 end

data/bin/xmp

@@ -2,10 +2,8 @@
 
 require 'rubygems'
 require 'commander/import'
-require "bundler/setup"
-require "xiaomi/push"
-require "awesome_print"
-
+require 'bundler/setup'
+require 'xiaomi/push'
 
 program :version, Xiaomi::Push::VERSION
 program :description, 'xiaomi push command line tool'

data/lib/xiaomi/push.rb

@@ -1,22 +1,16 @@
-require "xiaomi/push/version"
-require "xiaomi/push/error"
-require "xiaomi/push/const"
-require "xiaomi/push/client"
+require 'xiaomi/push/version'
+require 'xiaomi/push/error'
+require 'xiaomi/push/const'
+require 'xiaomi/push/client'
 
-require "xiaomi/push/devices/ios"
-require "xiaomi/push/devices/android"
-
-require "xiaomi/push/services/message"
-require "xiaomi/push/services/topic"
-require "xiaomi/push/services/feedback"
+require 'xiaomi/push/devices/ios'
+require 'xiaomi/push/devices/android'
 
+require 'xiaomi/push/services/message'
+require 'xiaomi/push/services/topic'
+require 'xiaomi/push/services/feedback'
 
 unless defined?(Dotenv)
   require 'dotenv'
   Dotenv.load
 end
-
-module Xiaomi
-  module Push
-  end
-end

data/lib/xiaomi/push/client.rb

@@ -8,7 +8,7 @@ module Xiaomi
 
       attr_reader :device, :secret, :header
       def initialize(secret)
-        @device = self.class.name.split("::")[-1].upcase
+        @device = self.class.name.split('::')[-1].upcase
         @secret = secret
 
         unless DEVICES.include?@device
@@ -34,12 +34,10 @@ module Xiaomi
         @feedback ||= Services::Feedback.new(self)
       end
 
-      
       def request(url, params)
         r = RestClient.post url, params, @header
         data = MultiJson.load r
       end
-
     end
   end
 end

data/lib/xiaomi/push/commands.rb

@@ -1,2 +1,7 @@
-# require 'xiaomi/push/commands/message'
+require 'xiaomi/push/commands/message'
 require 'xiaomi/push/commands/feedback'
+
+unless defined?(Dotenv)
+  require 'dotenv'
+  Dotenv.load
+end

data/lib/xiaomi/push/commands/feedback.rb

@@ -4,11 +4,11 @@ command :feedback do |c|
   c.description = ''
 
   # normal params
-  c.option '--device DEVICE', ['android', 'ios'], '设备类型'
+  c.option '--device DEVICE', %w('android', 'ios'), '设备类型'
   c.option '--secret SECRET', '应用密钥'
 
   c.action do |args, options|
-    ap options if $verbose
+    puts options if $verbose
 
     @device = options.device.capitalize if options.device
     @secret = options.secret
@@ -21,19 +21,19 @@ command :feedback do |c|
 
   private
 
-    def feedback!
-      client = Xiaomi::Push.const_get(@device).new(@secret)
-      r = client.feedback.invalid
+  def feedback!
+    client = Xiaomi::Push.const_get(@device).new(@secret)
+    r = client.feedback.invalid
 
-      ap r
-    end
+    puts r
+  end
 
-    def determine_device!
-      devices = %w[Android iOS].freeze
-      @device = choose "选择推送设备:", *devices
-    end
+  def determine_device!
+    devices = %w(Android iOS).freeze
+    @device = choose "选择推送设备:", *devices
+  end
 
-    def determine_secret!
-      @secret ||= ask '小米应用密钥:'
-    end
+  def determine_secret!
+    @secret ||= ask '小米应用密钥:'
+  end
 end

data/lib/xiaomi/push/commands/message.rb

@@ -4,7 +4,7 @@ command :message do |c|
   c.description = '使用小米推送消息（目前仅支持 regid/alias/topic 推送方式）'
 
   # normal params
-  c.option '--device DEVICE', ['android', 'ios'], '设备类型'
+  c.option '--device DEVICE', %w('android', 'ios'), '设备类型'
   c.option '--secret SECRET', '应用密钥'
 
   # type
@@ -18,16 +18,8 @@ command :message do |c|
   c.option '-b', '--badge BADGE', Integer, '消息数字'
   c.option '-e', '--extras KEY=VALUE', Array, '自定义数据(使用 KEY=VALUE 方式，多个以逗号不带空格分隔)'
 
-  # ## ios only
-  # c.option '-y', '--category CATEGORY', '推送类别名称 (仅 iOS 有效)'
-  # c.option '-v', '--environment ENV', [:production, :sandbox], '推送环境(仅 iOS 有效)'
-  #
-  # ## android only
-  # c.option '-g', '--through THROUGHT', [0, 1], '消息传递方式(仅 iOS 有效)'
-  # c.option '-n', '--notify NOTIFY', [-1, 1, 2, 4], 'message notify type'
-
   c.action do |args, options|
-    ap options if $verbose
+    puts options if $verbose
 
     @device = options.device.capitalize if options.device
     @secret = options.secret
@@ -43,78 +35,78 @@ command :message do |c|
 
   private
 
-    def sent!
-      message_data = {
-        @channel.to_sym => @channel_id,
-        :message => @message,
-      }
+  def sent!
+    message_data = {
+      @channel.to_sym => @channel_id,
+      :message => @message
+    }
 
-      if $verbose
-        ap message_data
-      end
+    if $verbose
+      puts message_data
+    end
 
-      client = Xiaomi::Push.const_get(@device).new(@secret)
-      r = client.message.send(message_data)
+    client = Xiaomi::Push.const_get(@device).new(@secret)
+    r = client.message.send(message_data)
 
-      ap r
-    end
+    puts r
+  end
 
-    def determine_android_message!(options)
-      @message = Xiaomi::Push::Message::Android.new(
-        title: @title,
-        description: @description,
-        badge: @badge,
-        extras: @extras
-      )
-    end
+  def determine_android_message!(options)
+    @message = Xiaomi::Push::Message::Android.new(
+      title: @title,
+      description: @description,
+      badge: @badge,
+      extras: @extras
+    )
+  end
 
-    def determine_ios_message!(options)
-      @message = Xiaomi::Push::Message::IOS.new(
-        description: @description,
-        badge: @badge,
-        extras: @extras
-      )
-    end
+  def determine_ios_message!(options)
+    @message = Xiaomi::Push::Message::IOS.new(
+      description: @description,
+      badge: @badge,
+      extras: @extras
+    )
+  end
 
-    def determine_message!(options)
-      @title = options.title
-      @description = options.description
-      @badge = options.badge
+  def determine_message!(options)
+    @title = options.title
+    @description = options.description
+    @badge = options.badge
 
-      @extras = if options.extras
-        Hash[options.extras.collect{|data| data.split(/\=/)}]
+    @extras =
+      if options.extras
+        Hash[options.extras.collect { |data| data.split(/\=/) }]
       else
         nil
       end
 
-      case @device.downcase
-      when 'android'
-        determine_android_message!(options)
-      when 'ios'
-        determine_ios_message!(options)
-      end
-    end
-
-    def determine_device!
-      devices = %w[Android iOS].freeze
-      @device = choose "选择推送设备:", *devices
+    case @device.downcase
+    when 'android'
+      determine_android_message!(options)
+    when 'ios'
+      determine_ios_message!(options)
     end
+  end
 
-    def determine_secret!
-      @secret ||= ask '小米应用密钥:'
-    end
+  def determine_device!
+    devices = %w(Android iOS).freeze
+    @device = choose "选择推送设备:", *devices
+  end
 
-    def determine_channel!(options)
-      channles = %w[regid alias topic].freeze
-      @channel = channles.select { |k| options.__hash__.has_key?k.to_sym }
+  def determine_secret!
+    @secret ||= ask '小米应用密钥:'
+  end
 
-      unless @channel.count > 0
-        @channel = choose "选择推送方式:", *channles
+  def determine_channel!(options)
+    channles = %w(regid alias topic).freeze
+    @channel = channles.select { |k| options.__hash__.key?k.to_sym }
 
-        @channel_id = ask "输入 #{@channel} 的值:"
-      else
-        @channel = @channel[0]
-        @channel_id = options.__hash__[@channel.to_sym]
-      end
+    if @channel.count > 0
+      @channel = @channel[0]
+      @channel_id = options.__hash__[@channel.to_sym]
+    else
+      @channel = choose "选择推送方式:", *channles
+      @channel_id = ask "输入 #{@channel} 的值:"
     end
+  end
 end

data/lib/xiaomi/push/const.rb

@@ -1,13 +1,12 @@
 require 'uri'
 
-
 module Xiaomi
   module Push
     module Const
-      DEVICES = %w[ANDROID IOS].freeze
+      DEVICES = %w(ANDROID IOS).freeze
 
-      PRODUCTION_URL = 'https://api.xmpush.xiaomi.com'
-      SANDBOX_URL = 'https://sandbox.xmpush.xiaomi.com'
+      PRODUCTION_URL = 'https://api.xmpush.xiaomi.com'.freeze
+      SANDBOX_URL = 'https://sandbox.xmpush.xiaomi.com'.freeze
 
       attr_reader :base_url
 
@@ -28,7 +27,7 @@ module Xiaomi
       end
 
       def build_uri(uri)
-        URI::join(@base_url, "v2/#{uri}").to_s
+        URI.join(@base_url, "v2/#{uri}").to_s
       end
     end
   end

data/lib/xiaomi/push/devices/ios.rb

@@ -1,11 +1,9 @@
 module Xiaomi
   module Push
     class IOS < Xiaomi::Push::Client
-
     end
 
     class Ios < Xiaomi::Push::Client
-
     end
   end
 end

data/lib/xiaomi/push/error.rb

@@ -5,7 +5,6 @@ module Xiaomi
     end
 
     class RequestError < Xiaomi::Push::Error
-
     end
 
     class FailuresError < Xiaomi::Push::Error

data/lib/xiaomi/push/services/feedback.rb

@@ -2,7 +2,6 @@ module Xiaomi
   module Push
     module Services
       class Feedback
-
         attr_reader :context
 
         def initialize(context)
@@ -12,7 +11,7 @@ module Xiaomi
         def invalid
           url = 'https://feedback.xmpush.xiaomi.com/v1/feedback/fetch_invalid_regids'
           r = RestClient.get url, @context.header
-          data = MultiJson.load r
+          MultiJson.load r
         end
       end
     end

data/lib/xiaomi/push/services/messages/base.rb

@@ -15,28 +15,28 @@ module Xiaomi
         def type(key, value = nil)
           key = "@#{key}"
 
-          unless value
-            instance_variable_get key
-          else
+          if value
             instance_variable_set key, value
+          else
+            instance_variable_get key
           end
         end
 
         def build
           hash_data = {}
           instance_variables.each do |ivar|
-            key = ivar.to_s.gsub('@', '')
+            key = ivar.to_s.delete('@', '')
             value = instance_variable_get ivar
 
-            if value
-              unless key == 'extras'
-                hash_data[key] = value
-              else
-                value.each do |k, v|
-                  key = "extra.#{k}"
-                  hash_data[key] = v
-                end
+            next unless value
+
+            if key == 'extras'
+              value.each do |k, v|
+                key = "extra.#{k}"
+                hash_data[key] = v
               end
+            else
+              hash_data[key] = value
             end
           end
 

data/lib/xiaomi/push/services/topic.rb

@@ -9,34 +9,35 @@ module Xiaomi
 
         def subscribe(**options)
           url, params = prepare_params(__method__.to_s, options)
-          data = @context.request url, params
+          @context.request url, params
         end
 
         def unsubscribe(**options)
           url, params = prepare_params(__method__.to_s, options)
-          data = @context.request url, params
+          @context.request url, params
         end
 
         private
-          def prepare_params(uri, options)
-            if options.has_key?(:reg_id)
-              type = "registration_id"
-              value = options[:reg_id]
-              url = @context.build_uri("topic/#{uri}")
-            elsif options.has_key?(:alias)
-              type = "aliases"
-              value = options[:alias]
-              url = @context.build_uri("topic/#{uri}/alias")
-            end
 
-            params = {
-              type.to_sym => value,
-              :topic => options[:name],
-              :category => options[:category],
-            }
-
-            [url, params]
+        def prepare_params(uri, options)
+          if options.key?(:reg_id)
+            type = 'registration_id'
+            value = options[:reg_id]
+            url = @context.build_uri("topic/#{uri}")
+          elsif options.key?(:alias)
+            type = 'aliases'
+            value = options[:alias]
+            url = @context.build_uri("topic/#{uri}/alias")
           end
+
+          params = {
+            type.to_sym => value,
+            :topic => options[:name],
+            :category => options[:category]
+          }
+
+          [url, params]
+        end
       end
     end
   end

data/lib/xiaomi/push/version.rb

@@ -1,5 +1,5 @@
 module Xiaomi
   module Push
-    VERSION = "0.2.1"
+    VERSION = '0.2.3'
   end
 end

data/xiaomi-push.gemspec

@@ -4,26 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xiaomi/push/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "xiaomi-push"
+  spec.name          = 'xiaomi-push'
   spec.version       = Xiaomi::Push::VERSION
-  spec.authors       = ["icyleaf"]
-  spec.email         = ["icyleaf.cn@gmail.com"]
+  spec.authors       = ['icyleaf']
+  spec.email         = ['icyleaf.cn@gmail.com']
 
-  spec.summary       = %q{MiPush Server SDK for Ruby}
-  spec.description   = %q{MiPush Server SDK for Ruby}
-  spec.homepage      = "http://github.com/icyleaf/xiaomi-push"
+  spec.summary       = 'MiPush Server SDK for Ruby'
+  spec.description   = 'MiPush Server SDK for Ruby'
+  spec.homepage      = 'http://github.com/icyleaf/xiaomi-push'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rest-client", ">= 1.7.3"
-  spec.add_dependency "commander", "~> 4.3.2"
-  spec.add_dependency "multi_json", "~> 1.11.0"
+  spec.add_dependency 'rest-client', '>= 1.7.3'
+  spec.add_dependency 'commander', '~> 4.3.2'
+  spec.add_dependency 'multi_json', '~> 1.11.0'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "dotenv", "~> 2.0.1"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'dotenv', '~> 2.0.1'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiaomi-push
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: MiPush Server SDK for Ruby