jpush 4.0.8 → 4.0.10

data/lib/jpush/{schedule.rb → schedules.rb}

@@ -1,49 +1,53 @@
-require 'jpush/schedule/schedule_payload'
-require 'jpush/http/client'
-
-module JPush
-
-  module Schedule
-    extend self
-
-    # POST https://api.jpush.cn/v3/schedules
-    # 创建一个新的定时任务
-    def create(schedule_payload)
-      schedule_payload = schedule_payload.is_a?(SchedulePayload) ? schedule_payload : nil
-      body = schedule_payload.to_hash
-      Http::Client.post(base_url, body: body)
-    end
-
-    # GET https://api.jpush.cn/v3/schedules?page=
-    # 获取当前有效（endtime未过期）的 schedule 列表
-    def tasks(page = nil)
-      Http::Client.get(base_url, params: { page: page })
-    end
-
-    # 获取指定的定时任务
-    # GET https://api.jpush.cn/v3/schedules/{schedule_id}
-    def show(schedule_id)
-      Http::Client.get(base_url + schedule_id)
-    end
-
-    # 修改指定的Schedule
-    # PUT https://api.jpush.cn/v3/schedules/{schedule_id}
-    def update(schedule_id, name: nil, enabled: nil, trigger: nil, push: nil)
-      body = SchedulePayload.new(name, trigger, push, enabled).to_update_hash
-      Http::Client.put(base_url + schedule_id, body: body)
-    end
-
-    # 删除指定的Schedule任务
-    # DELETE https://api.jpush.cn/v3/schedules/{schedule_id}
-    def delete(schedule_id)
-      Http::Client.delete(base_url + schedule_id)
-    end
-
-    private
-
-      def base_url
-        Config.settings[:push_api_host] + Config.settings[:api_version] + '/schedules/'
-      end
-
-  end
-end
+require 'jpush/schedule/schedule_payload'
+require 'jpush/http/client'
+require 'jpush/handler'
+
+module JPush
+
+  class Schedules < Handler
+
+    def initialize(jpush)
+      @jpush = jpush;
+    end
+
+    # POST https://api.jpush.cn/v3/schedules
+    # 创建一个新的定时任务
+    def create(schedule_payload)
+      schedule_payload = schedule_payload.is_a?(JPush::Schedule::SchedulePayload) ? schedule_payload : nil
+      body = schedule_payload.to_hash
+      Http::Client.post(@jpush, base_url, body: body)
+    end
+
+    # GET https://api.jpush.cn/v3/schedules?page=
+    # 获取当前有效（endtime未过期）的 schedule 列表
+    def tasks(page = nil)
+      Http::Client.get(@jpush, base_url, params: { page: page })
+    end
+
+    # 获取指定的定时任务
+    # GET https://api.jpush.cn/v3/schedules/{schedule_id}
+    def show(schedule_id)
+      Http::Client.get(@jpush, base_url + schedule_id)
+    end
+
+    # 修改指定的Schedule
+    # PUT https://api.jpush.cn/v3/schedules/{schedule_id}
+    def update(schedule_id, name: nil, enabled: nil, trigger: nil, push: nil)
+      body = JPush::Schedule::SchedulePayload.new(name, trigger, push, enabled).to_update_hash
+      Http::Client.put(@jpush, base_url + schedule_id, body: body)
+    end
+
+    # 删除指定的Schedule任务
+    # DELETE https://api.jpush.cn/v3/schedules/{schedule_id}
+    def delete(schedule_id)
+      Http::Client.delete(@jpush, base_url + schedule_id)
+    end
+
+    private
+
+      def base_url
+        'https://api.jpush.cn/v3/schedules/'
+      end
+
+  end
+end

data/lib/jpush/utils/exceptions.rb

@@ -1,34 +1,34 @@
-module JPush
-  module Utils
-    module Exceptions
-
-      class JPushError < StandardError
-        attr_reader :message
-        def initialize(message)
-          @message = message
-        end
-      end
-
-      class JPushResponseError < JPushError
-        attr_reader :http_code, :error_code, :error_message
-
-        def initialize(http_code, error_code, error_message)
-          @http_code, @error_code, @error_message = http_code, error_code, error_message
-          @error_message = "UnknownError[#{@http_code}]." if @error_message.nil?
-          super("#{@error_message} (error code: #{@error_code}) ")
-        end
-
-        def to_s
-          "#{@message}. http status code: #{@http_code}"
-        end
-      end
-
-      class TimeOutError < JPushError
-        def initialize(error)
-          super("#{error.class} was raised, please rescue it")
-        end
-      end
-
-    end
-  end
-end
+module JPush
+  module Utils
+    module Exceptions
+
+      class JPushError < StandardError
+        attr_reader :message
+        def initialize(message)
+          @message = message
+        end
+      end
+
+      class JPushResponseError < JPushError
+        attr_reader :http_code, :error_code, :error_message
+
+        def initialize(http_code, error_code, error_message)
+          @http_code, @error_code, @error_message = http_code, error_code, error_message
+          @error_message = "UnknownError[#{@http_code}]." if @error_message.nil?
+          super("#{@error_message} (error code: #{@error_code}) ")
+        end
+
+        def to_s
+          "#{@message}. http status code: #{@http_code}"
+        end
+      end
+
+      class TimeOutError < JPushError
+        def initialize(error)
+          super("#{error.class} was raised, please rescue it")
+        end
+      end
+
+    end
+  end
+end

data/lib/jpush/version.rb

@@ -1,3 +1,3 @@
-module JPush
-  VERSION = "4.0.8"
-end
+module JPush
+  VERSION = "4.0.10"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpush
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.10
 platform: ruby
 authors:
 - JPush Offical
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,21 +71,21 @@ files:
 - docs/Guides.md
 - jpush.gemspec
 - lib/jpush.rb
-- lib/jpush/api.rb
-- lib/jpush/config.rb
+- lib/jpush/client.rb
 - lib/jpush/device.rb
+- lib/jpush/handler.rb
 - lib/jpush/http/client.rb
 - lib/jpush/http/response.rb
-- lib/jpush/push.rb
 - lib/jpush/push/audience.rb
 - lib/jpush/push/notification.rb
 - lib/jpush/push/push_payload.rb
+- lib/jpush/push/single_push_payload.rb
+- lib/jpush/pusher.rb
 - lib/jpush/report.rb
-- lib/jpush/schedule.rb
 - lib/jpush/schedule/schedule_payload.rb
 - lib/jpush/schedule/trigger.rb
+- lib/jpush/schedules.rb
 - lib/jpush/utils/exceptions.rb
-- lib/jpush/utils/http.rb
 - lib/jpush/version.rb
 homepage: https://github.com/jpush/jpush-api-ruby-client
 licenses:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: JPush's officially supported Ruby client library for accessing JPush APIs.

data/lib/jpush/api.rb

@@ -1,42 +0,0 @@
-require 'jpush/device'
-require 'jpush/push'
-require 'jpush/report'
-require 'jpush/schedule'
-
-module JPush
-  module API
-    def devices
-      Device
-    end
-
-    def tags
-      Tag
-    end
-
-    def aliases
-      Alias
-    end
-
-    def pusher
-      Push
-    end
-
-    def reporter
-      Report
-    end
-
-    def schedules
-      Schedule
-    end
-  end
-
-  class Client
-    include JPush::API
-
-    def initialize(app_key, master_secret)
-      JPush::Config.init(app_key, master_secret)
-    end
-
-  end
-
-end

data/lib/jpush/config.rb

@@ -1,20 +0,0 @@
-module JPush
-  module Config
-    extend self
-
-    DEFAULT_OPTIONS = {
-      api_version: 'v3',
-      push_api_host: 'https://api.jpush.cn/',
-      device_api_host: 'https://device.jpush.cn/',
-      report_api_host: 'https://report.jpush.cn/',
-      valid_platform: ['android', 'ios']
-    }
-
-    attr_reader :settings
-
-    def init(app_key, master_secret)
-      @settings = DEFAULT_OPTIONS.merge!(app_key: app_key, master_secret: master_secret)
-    end
-
-  end
-end

data/lib/jpush/push.rb

@@ -1,34 +0,0 @@
-require 'jpush/push/push_payload'
-require 'jpush/http/client'
-
-module JPush
-  module Push
-    extend self
-
-    # POST https://api.jpush.cn/v3/push/validate
-    # 验证推送调用是否能够成功，与推送 API 的区别在于：不向用户发送任何消息
-    def validate(push_payload)
-      url = base_url + 'validate'
-      send_push(url, push_payload)
-    end
-
-    # POST https://api.jpush.cn/v3/push
-    # 向某单个设备或者某设备列表推送一条通知、或者消息
-    def push(push_payload)
-      send_push(base_url, push_payload)
-    end
-
-    private
-
-      def send_push(url, push_payload)
-        push_payload = push_payload.is_a?(PushPayload) ? push_payload : nil
-        body = push_payload.to_hash
-        Http::Client.post(url, body: body)
-      end
-
-      def base_url
-        Config.settings[:push_api_host] + Config.settings[:api_version] + '/push/'
-      end
-
-  end
-end

data/lib/jpush/utils/http.rb

@@ -1,78 +0,0 @@
-require 'net/http'
-require 'json'
-require 'jpush/utils/exceptions'
-
-module JPush
-  module Utils
-    class Http
-
-      DEFAULT_USER_AGENT = 'jpush-api-ruby-client/' + JPush::VERSION
-      DEFAULT_OPEN_TIMEOUT = 20
-      DEFAULT_READ_TIMEOUT = 120
-      DEFAULT_RETRY_TIMES = 3
-      RETRY_SLEEP_TIME = 3
-
-      HTTP_VERB_MAP = {
-        get:    Net::HTTP::Get,
-        post:   Net::HTTP::Post,
-        put:    Net::HTTP::Put,
-        delete: Net::HTTP::Delete
-      }
-
-      DEFAULT_HEADERS = {
-        'user-agent' => DEFAULT_USER_AGENT,
-        'accept' => 'application/json',
-        'content-type' => 'application/json',
-        'connection' => 'close'
-      }
-
-      def initialize(method, url, params: nil, body: nil, headers: {}, opts: {})
-        method = method.downcase.to_sym
-        err_msg = "http method #{method} is not supported"
-        raise Utils::Exceptions::JPushError, err_msg unless HTTP_VERB_MAP.keys.include?(method)
-        @uri = URI(url)
-        @uri.query = URI.encode_www_form(params) unless params.nil?
-        @request = prepare_request(method, body, headers)
-        @opts = opts
-      end
-
-      def send_request
-        tries ||= DEFAULT_RETRY_TIMES
-        opts ||= default_opts.merge @opts
-        Net::HTTP.start(@uri.host, @uri.port, opts) do |http|
-          http.request(@request)
-        end
-      # if raise Timeout::Error retry it for 3 times
-      rescue Net::OpenTimeout, Net::ReadTimeout => e
-        (tries -= 1).zero? ? (raise Utils::Exceptions::TimeOutError.new(e)) : retry
-      end
-
-      def basic_auth(user = nil, password = nil)
-        user ||= Config.settings[:app_key]
-        password ||= Config.settings[:master_secret]
-        @request.basic_auth(user, password)
-        self
-      end
-
-      private
-
-        def prepare_request(method, body, headers)
-          headers = DEFAULT_HEADERS.merge(headers)
-          request = HTTP_VERB_MAP[method].new @uri
-          request.initialize_http_header(headers)
-          request.body = body.to_json unless body.nil?
-          request
-        end
-
-
-        def default_opts
-          {
-            use_ssl: 'https' == @uri.scheme,
-            open_timeout: DEFAULT_OPEN_TIMEOUT,
-            read_timeout: DEFAULT_READ_TIMEOUT
-          }
-        end
-
-    end
-  end
-end