jpush 4.0.10 → 4.0.11

data/lib/jpush/schedule/schedule_payload.rb

@@ -1,48 +1,48 @@
-require 'jpush/push/push_payload'
-require 'jpush/schedule/trigger'
-
-module JPush
-  module Schedule
-    class SchedulePayload
-
-      def initialize(name, trigger, push_payload, enabled = nil)
-        @name = name
-        @trigger = build_trigger(trigger)
-        @push_payload = build_push_payload(push_payload)
-        @enabled = enabled
-      end
-
-      def to_update_hash
-        @schedule_payload = {
-          name: @name,
-          enabled: @enabled,
-          trigger: @trigger,
-          push: @push_payload
-        }.select { |_, value| !value.nil? }
-        raise Utils::Exceptions::JPushError, 'Schedule update body can not be empty' if @schedule_payload.empty?
-        @schedule_payload
-      end
-
-      def to_hash
-        @schedule_payload = {
-          name: @name,
-          enabled: true,
-          trigger: @trigger,
-          push: @push_payload
-        }
-        hash = @schedule_payload.select { |_, value| value.nil? }
-        @schedule_payload
-      end
-
-      def build_trigger(trigger)
-        return { single: { time: trigger.strftime('%F %T') } } if trigger.is_a? Time
-        trigger.is_a?(Trigger) ? trigger.to_hash : nil
-      end
-
-      def build_push_payload(push_payload)
-        push_payload.is_a?(Push::PushPayload) ? push_payload.to_hash : nil
-      end
-
-    end
-  end
-end
+require 'jpush/push/push_payload'
+require 'jpush/schedule/trigger'
+
+module JPush
+  module Schedule
+    class SchedulePayload
+
+      def initialize(name, trigger, push_payload, enabled = nil)
+        @name = name
+        @trigger = build_trigger(trigger)
+        @push_payload = build_push_payload(push_payload)
+        @enabled = enabled
+      end
+
+      def to_update_hash
+        @schedule_payload = {
+          name: @name,
+          enabled: @enabled,
+          trigger: @trigger,
+          push: @push_payload
+        }.select { |_, value| !value.nil? }
+        raise Utils::Exceptions::JPushError, 'Schedule update body can not be empty' if @schedule_payload.empty?
+        @schedule_payload
+      end
+
+      def to_hash
+        @schedule_payload = {
+          name: @name,
+          enabled: true,
+          trigger: @trigger,
+          push: @push_payload
+        }
+        hash = @schedule_payload.select { |_, value| value.nil? }
+        @schedule_payload
+      end
+
+      def build_trigger(trigger)
+        return { single: { time: trigger.strftime('%F %T') } } if trigger.is_a? Time
+        trigger.is_a?(Trigger) ? trigger.to_hash : nil
+      end
+
+      def build_push_payload(push_payload)
+        push_payload.is_a?(Push::PushPayload) ? push_payload.to_hash : nil
+      end
+
+    end
+  end
+end

data/lib/jpush/schedule/trigger.rb

@@ -1,53 +1,53 @@
-module JPush
-  module Schedule
-    class Trigger
-
-      WEEK = ['MON','TUE','WED','THU','FRI','SAT','SUN']
-      MDAY = ('01'..'31').to_a
-
-      def set_single(time)
-        @periodical = nil
-        @single = { time: time.strftime('%F %T') }
-        self
-      end
-
-      def set_periodical(start_time, end_time, time, time_unit, frequency, point)
-        @single = nil
-        require 'time'
-        frequency = 100 if frequency > 100
-        @periodical = {
-          start: start_time.strftime('%F %T'),
-          end: end_time.strftime('%F %T'),
-          time: Time.parse(time).strftime('%T'),
-          time_unit: time_unit,
-          frequency: frequency,
-          point: build_point(time_unit, point)
-        }
-        self
-      end
-
-      def to_hash
-        @trigger = {}
-        @trigger[:single] = @single unless @single.nil?
-        @trigger[:periodical] = @periodical unless @periodical.nil?
-        @trigger
-      end
-
-      private
-
-        def build_point(time_unit, point)
-          array = [point].flatten
-          point =
-            case time_unit.upcase
-            when 'DAY'
-              nil
-            when 'WEEK'
-              WEEK & array.map{ |e| e.upcase }
-            when 'MONTH'
-              MDAY & array
-            end
-        end
-
-    end
-  end
-end
+module JPush
+  module Schedule
+    class Trigger
+
+      WEEK = ['MON','TUE','WED','THU','FRI','SAT','SUN']
+      MDAY = ('01'..'31').to_a
+
+      def set_single(time)
+        @periodical = nil
+        @single = { time: time.strftime('%F %T') }
+        self
+      end
+
+      def set_periodical(start_time, end_time, time, time_unit, frequency, point)
+        @single = nil
+        require 'time'
+        frequency = 100 if frequency > 100
+        @periodical = {
+          start: start_time.strftime('%F %T'),
+          end: end_time.strftime('%F %T'),
+          time: Time.parse(time).strftime('%T'),
+          time_unit: time_unit,
+          frequency: frequency,
+          point: build_point(time_unit, point)
+        }
+        self
+      end
+
+      def to_hash
+        @trigger = {}
+        @trigger[:single] = @single unless @single.nil?
+        @trigger[:periodical] = @periodical unless @periodical.nil?
+        @trigger
+      end
+
+      private
+
+        def build_point(time_unit, point)
+          array = [point].flatten
+          point =
+            case time_unit.upcase
+            when 'DAY'
+              nil
+            when 'WEEK'
+              WEEK & array.map{ |e| e.upcase }
+            when 'MONTH'
+              MDAY & array
+            end
+        end
+
+    end
+  end
+end

data/lib/jpush/schedules.rb

@@ -1,53 +1,53 @@
-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
+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.10"
-end
+module JPush
+  VERSION = "4.0.11"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpush
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 4.0.11
 platform: ruby
 authors:
 - JPush Offical
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler