jpush 4.0.8 → 4.0.10

data/jpush.gemspec

@@ -1,35 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jpush/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "jpush"
-  spec.version       = JPush::VERSION
-  spec.authors       = ["JPush Offical"]
-  spec.email         = ["support@jpush.cn"]
-
-  spec.summary       = %q{JPush's officially supported Ruby client library for accessing JPush APIs.}
-  spec.description   = %q{JPush's officially supported Ruby client library for accessing JPush APIs. 极光推送官方支持的 Ruby 版本服务器端 SDK. 相应的 API 文档：http://docs.jpush.io/server/server_overview/ }
-  spec.homepage      = "https://github.com/jpush/jpush-api-ruby-client"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  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_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.required_ruby_version = '>= 2.2'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'jpush/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "jpush"
+  spec.version       = JPush::VERSION
+  spec.authors       = ["JPush Offical"]
+  spec.email         = ["support@jpush.cn"]
+
+  spec.summary       = %q{JPush's officially supported Ruby client library for accessing JPush APIs.}
+  spec.description   = %q{JPush's officially supported Ruby client library for accessing JPush APIs. 极光推送官方支持的 Ruby 版本服务器端 SDK. 相应的 API 文档：http://docs.jpush.io/server/server_overview/ }
+  spec.homepage      = "https://github.com/jpush/jpush-api-ruby-client"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  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_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+
+  spec.required_ruby_version = '>= 2.2'
+end

data/lib/jpush.rb

@@ -1,9 +1,8 @@
-require "jpush/version"
-
-module JPush
-  # Your code goes here...
-  require 'jpush/api'
-  require 'jpush/config'
-  require 'jpush/utils/http'
-
-end
+require "jpush/version"
+
+module JPush
+  # Your code goes here...
+
+end
+
+require 'jpush/client'

data/lib/jpush/client.rb

@@ -0,0 +1,43 @@
+require 'jpush/device'
+require 'jpush/pusher'
+require 'jpush/report'
+require 'jpush/schedules'
+
+module JPush
+  class Client
+
+    attr_reader :app_key
+    attr_reader :master_secret
+
+    def initialize(app_key, master_secret)
+      @app_key = app_key
+      @master_secret = master_secret
+    end
+
+    def devices
+      @devices ||= Device.new(self)
+    end
+
+    def tags
+      @tag ||= Tag.new(self)
+    end
+
+    def aliases
+      @alias ||= Alias.new(self)
+    end
+
+    def pusher
+      @push ||= Pusher.new(self)
+    end
+
+    def reporter
+      @report ||= Report.new(self)
+    end
+
+    def schedules
+      @schedule ||= Schedules.new(self)
+    end
+
+  end
+
+end

data/lib/jpush/device.rb

@@ -1,165 +1,163 @@
-require 'jpush/http/client'
-
-module JPush
-  module Device
-    extend self
-
-    # GET /v3/devices/{registration_id}
-    # 获取当前设备的所有属性
-    def show(registration_id)
-      url = base_url + registration_id
-      Http::Client.get(url)
-    end
-
-    # POST /v3/devices/{registration_id}
-    # 更新当前设备的指定属性，当前支持tags, alias，手机号码mobile
-    def update(registration_id, tags_add: nil, tags_remove: nil, clear_tags: false, alis: nil, mobile: nil)
-      tags =
-        if clear_tags
-            ''
-        else
-          hash = {}
-          hash[:add] = [tags_add].flatten unless tags_add.nil?
-          hash[:remove] = [tags_remove].flatten unless tags_remove.nil?
-          hash.empty? ? nil : hash
-        end
-      body = {
-        tags: tags,
-        alias: alis,
-        mobile: mobile
-      }.select { |_, value| !value.nil? }
-
-      url = base_url + registration_id
-      Http::Client.post(url, body: body)
-    end
-
-    # 下面两个方法接受一个参数,其类型为数组或字符串
-    def add_tags(registration_id, tags)
-      update(registration_id, tags_add: tags)
-    end
-
-    def remove_tags(registration_id, tags)
-      update(registration_id, tags_remove: tags)
-    end
-
-    def clear_tags(registration_id)
-      update(registration_id, clear_tags: true)
-    end
-
-    def update_alias(registration_id, alis)
-      update(registration_id, alis: alis)
-    end
-
-    def delete_alias(registration_id)
-      update(registration_id, alis: '')
-    end
-
-    def update_mobile(registration_id, mobile)
-      update(registration_id, mobile: mobile)
-    end
-
-    # 获取用户在线状态
-    # POST /v3/devices/status/
-    def status(registration_ids)
-      registration_ids = [registration_ids].flatten
-      url = base_url + 'status'
-      body = { registration_ids: registration_ids }
-      Http::Client.post(url, body: body)
-    end
-
-    private
-
-      def base_url
-        Config.settings[:device_api_host] + Config.settings[:api_version] + '/devices/'
-      end
-
-  end
-
-
-  module Tag
-    extend self
-
-    # GET /v3/tags/
-    # 获取当前应用的所有标签列表。
-    def list
-      url = base_url
-      Http::Client.get(url)
-    end
-
-    # GET /v3/tags/{tag_value}/registration_ids/{registration_id}
-    # 查询某个设备是否在 tag 下
-    def has_device?(tag_value, registration_id)
-      url = base_url + "#{tag_value}/registration_ids/#{registration_id}"
-      Http::Client.get(url)
-    end
-
-    # POST /v3/tags/{tag_value}
-    # 为一个标签添加或者删除设备。
-    def update(tag_value, devices_add: nil, devices_remove: nil)
-      rids = {}
-      rids[:add] = [devices_add].flatten unless devices_add.nil?
-      rids[:remove] = [devices_remove].flatten unless devices_remove.nil?
-
-      body = { registration_ids: rids }
-      url = base_url + tag_value
-      Http::Client.post(url, body: body)
-    end
-
-    # 下面两个方法接受一个参数,其类型为数组或字符串
-    def add_devices(tag_value, registration_ids)
-      update(tag_value, devices_add: registration_ids)
-    end
-
-    def remove_devices(tag_value, registration_ids)
-      update(tag_value, devices_remove: registration_ids)
-    end
-
-    # DELETE /v3/tags/{tag_value}
-    # 删除一个标签，以及标签与设备之间的关联关系
-    def delete(tag_value, platform = nil)
-      params = platform.nil? ? nil : { platform: [platform].flatten.join(',') }
-      url = base_url + tag_value
-      Http::Client.delete(url, params: params)
-    end
-
-    private
-
-      def base_url
-        Config.settings[:device_api_host] + Config.settings[:api_version] + '/tags/'
-      end
-
-  end
-
-
-  module Alias
-    extend self
-
-    # GET /v3/aliases/{alias_value}
-    # 获取指定alias下的设备，最多输出10个
-    def show(alias_value, platform = nil)
-      params = platform.nil? ? nil : { platform: build_platform(platform) }
-      url = base_url + alias_value
-      Http::Client.get(url, params: params)
-    end
-
-    # DELETE /v3/aliases/{alias_value}
-    # 删除一个别名，以及该别名与设备的绑定关系
-    def delete(alias_value, platform = nil)
-      params = platform.nil? ? nil : { platform: build_platform(platform) }
-      url = base_url + alias_value
-      Http::Client.delete(url, params: params)
-    end
-
-    private
-
-      def base_url
-        Config.settings[:device_api_host] + Config.settings[:api_version] + '/aliases/'
-      end
-
-      def build_platform(p)
-        [p].flatten.join(',')
-      end
-
-  end
-
-end
+require 'jpush/http/client'
+require 'jpush/handler'
+
+module JPush
+  class Device < Handler
+
+    # GET /v3/devices/{registration_id}
+    # 获取当前设备的所有属性
+    def show(registration_id)
+      url = base_url + registration_id
+      Http::Client.get(@jpush, url)
+    end
+
+    # POST /v3/devices/{registration_id}
+    # 更新当前设备的指定属性，当前支持tags, alias，手机号码mobile
+    def update(registration_id, tags_add: nil, tags_remove: nil, clear_tags: false, alis: nil, mobile: nil)
+      tags =
+        if clear_tags
+            ''
+        else
+          hash = {}
+          hash[:add] = [tags_add].flatten unless tags_add.nil?
+          hash[:remove] = [tags_remove].flatten unless tags_remove.nil?
+          hash.empty? ? nil : hash
+        end
+      body = {
+        tags: tags,
+        alias: alis,
+        mobile: mobile
+      }.select { |_, value| !value.nil? }
+
+      url = base_url + registration_id
+      Http::Client.post(@jpush, url, body: body)
+    end
+
+    # 下面两个方法接受一个参数,其类型为数组或字符串
+    def add_tags(registration_id, tags)
+      update(registration_id, tags_add: tags)
+    end
+
+    def remove_tags(registration_id, tags)
+      update(registration_id, tags_remove: tags)
+    end
+
+    def clear_tags(registration_id)
+      update(registration_id, clear_tags: true)
+    end
+
+    def update_alias(registration_id, alis)
+      update(registration_id, alis: alis)
+    end
+
+    def delete_alias(registration_id)
+      update(registration_id, alis: '')
+    end
+
+    def update_mobile(registration_id, mobile)
+      update(registration_id, mobile: mobile)
+    end
+
+    # 获取用户在线状态
+    # POST /v3/devices/status/
+    def status(registration_ids)
+      registration_ids = [registration_ids].flatten
+      url = base_url + 'status'
+      body = { registration_ids: registration_ids }
+      Http::Client.post(@jpush, url, body: body)
+    end
+
+    private
+
+      def base_url
+        'https://device.jpush.cn/v3/devices/'
+      end
+
+  end
+
+
+  class Tag < Handler
+
+    # GET /v3/tags/
+    # 获取当前应用的所有标签列表。
+    def list
+      url = base_url
+      Http::Client.get(@jpush, url)
+    end
+
+    # GET /v3/tags/{tag_value}/registration_ids/{registration_id}
+    # 查询某个设备是否在 tag 下
+    def has_device?(tag_value, registration_id)
+      url = base_url + "#{tag_value}/registration_ids/#{registration_id}"
+      Http::Client.get(@jpush, url)
+    end
+
+    # POST /v3/tags/{tag_value}
+    # 为一个标签添加或者删除设备。
+    def update(tag_value, devices_add: nil, devices_remove: nil)
+      rids = {}
+      rids[:add] = [devices_add].flatten unless devices_add.nil?
+      rids[:remove] = [devices_remove].flatten unless devices_remove.nil?
+
+      body = { registration_ids: rids }
+      url = base_url + tag_value
+      Http::Client.post(@jpush, url, body: body)
+    end
+
+    # 下面两个方法接受一个参数,其类型为数组或字符串
+    def add_devices(tag_value, registration_ids)
+      update(tag_value, devices_add: registration_ids)
+    end
+
+    def remove_devices(tag_value, registration_ids)
+      update(tag_value, devices_remove: registration_ids)
+    end
+
+    # DELETE /v3/tags/{tag_value}
+    # 删除一个标签，以及标签与设备之间的关联关系
+    def delete(tag_value, platform = nil)
+      params = platform.nil? ? nil : { platform: [platform].flatten.join(',') }
+      url = base_url + tag_value
+      Http::Client.delete(@jpush, url, params: params)
+    end
+
+    private
+
+      def base_url
+        'https://device.jpush.cn/v3/tags/'
+      end
+
+  end
+
+
+  class Alias < Handler
+
+    # GET /v3/aliases/{alias_value}
+    # 获取指定alias下的设备，最多输出10个
+    def show(alias_value, platform = nil)
+      params = platform.nil? ? nil : { platform: build_platform(platform) }
+      url = base_url + alias_value
+      Http::Client.get(@jpush, url, params: params)
+    end
+
+    # DELETE /v3/aliases/{alias_value}
+    # 删除一个别名，以及该别名与设备的绑定关系
+    def delete(alias_value, platform = nil)
+      params = platform.nil? ? nil : { platform: build_platform(platform) }
+      url = base_url + alias_value
+      Http::Client.delete(@jpush, url, params: params)
+    end
+
+    private
+
+      def base_url
+        'https://device.jpush.cn/v3/aliases/'
+      end
+
+      def build_platform(p)
+        [p].flatten.join(',')
+      end
+
+  end
+
+end