jpush 4.0.10 → 4.0.11

data/lib/jpush/handler.rb

@@ -1,8 +1,8 @@
-module JPush
-  class Handler
-
-    def initialize(jpush)
-      @jpush = jpush
-    end
-  end
+module JPush
+  class Handler
+
+    def initialize(jpush)
+      @jpush = jpush
+    end
+  end
 end

data/lib/jpush/http/client.rb

@@ -1,100 +1,100 @@
-require_relative 'response'
-require 'net/http'
-require 'json'
-require 'jpush/utils/exceptions'
-
-module JPush
-  module Http
-    class Client
-
-      class << self
-
-        def get(jpush, url, params: nil, headers: {})
-          request(jpush, :get, url, params: params, headers: headers)
-        end
-
-        def post(jpush, url, body: , headers: {})
-          request(jpush, :post, url, body: body, headers: headers)
-        end
-
-        def put(jpush, url, body: , headers: {})
-          request(jpush, :put, url, body: body, headers: headers)
-        end
-
-        def delete(jpush, url, params: nil, headers: {})
-          request(jpush, :delete, url, params: params, headers: headers)
-        end
-
-        def request(jpush, method, url, params: nil, body: nil, headers: {}, opts: {})
-          raw_response = self.new(
-            jpush,
-            method,
-            url,
-            params: params,
-            body: body,
-            headers: headers,
-            opts: opts
-          ).send_request
-
-          Response.new(raw_response)
-        end
-
-      end
-
-      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(jpush, method, url, params: nil, body: nil, headers: {}, opts: {})
-        method = method.downcase.to_sym
-        @uri = URI(url)
-        @uri.query = URI.encode_www_form(params) unless params.nil?
-        @request = prepare_request(method, body, headers)
-        @request.basic_auth(jpush.app_key, jpush.master_secret)
-        @opts = opts
-      end
-
-      def send_request
-        tries ||= DEFAULT_RETRY_TIMES
-        opts ||=  {
-          use_ssl: 'https' == @uri.scheme,
-          open_timeout: DEFAULT_OPEN_TIMEOUT,
-          read_timeout: DEFAULT_READ_TIMEOUT
-        }.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
-
-      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
-
-    end
-  end
-end
+require_relative 'response'
+require 'net/http'
+require 'json'
+require 'jpush/utils/exceptions'
+
+module JPush
+  module Http
+    class Client
+
+      class << self
+
+        def get(jpush, url, params: nil, headers: {})
+          request(jpush, :get, url, params: params, headers: headers)
+        end
+
+        def post(jpush, url, body: , headers: {})
+          request(jpush, :post, url, body: body, headers: headers)
+        end
+
+        def put(jpush, url, body: , headers: {})
+          request(jpush, :put, url, body: body, headers: headers)
+        end
+
+        def delete(jpush, url, params: nil, headers: {})
+          request(jpush, :delete, url, params: params, headers: headers)
+        end
+
+        def request(jpush, method, url, params: nil, body: nil, headers: {}, opts: {})
+          raw_response = self.new(
+            jpush,
+            method,
+            url,
+            params: params,
+            body: body,
+            headers: headers,
+            opts: opts
+          ).send_request
+
+          Response.new(raw_response)
+        end
+
+      end
+
+      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(jpush, method, url, params: nil, body: nil, headers: {}, opts: {})
+        method = method.downcase.to_sym
+        @uri = URI(url)
+        @uri.query = URI.encode_www_form(params) unless params.nil?
+        @request = prepare_request(method, body, headers)
+        @request.basic_auth(jpush.app_key, jpush.master_secret)
+        @opts = opts
+      end
+
+      def send_request
+        tries ||= DEFAULT_RETRY_TIMES
+        opts ||=  {
+          use_ssl: 'https' == @uri.scheme,
+          open_timeout: DEFAULT_OPEN_TIMEOUT,
+          read_timeout: DEFAULT_READ_TIMEOUT
+        }.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
+
+      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
+
+    end
+  end
+end

data/lib/jpush/http/response.rb

@@ -1,33 +1,33 @@
-module JPush
-  module Http
-    class Response
-
-      attr_accessor :http_code, :body, :heades
-
-      def initialize(raw_response)
-        @http_code = raw_response.code.to_i
-        @body = parse_body(raw_response.body)
-        build_error unless raw_response.kind_of? Net::HTTPSuccess
-      end
-
-      private
-
-        def parse_body(body)
-          body = JSON.parse(body)
-        rescue JSON::ParserError
-          body
-        end
-
-        def build_error
-          error_code, error_message =
-            if @body.has_key?('error')
-              [@body['error']['code'], @body['error']['message']]
-            else
-              [@body['code'], @body['message']]
-            end
-          raise Utils::Exceptions::JPushResponseError.new(http_code, error_code, error_message)
-        end
-
-    end
-  end
-end
+module JPush
+  module Http
+    class Response
+
+      attr_accessor :http_code, :body, :heades
+
+      def initialize(raw_response)
+        @http_code = raw_response.code.to_i
+        @body = parse_body(raw_response.body)
+        build_error unless raw_response.kind_of? Net::HTTPSuccess
+      end
+
+      private
+
+        def parse_body(body)
+          body = JSON.parse(body)
+        rescue JSON::ParserError
+          raise Utils::Exceptions::JPushResponseError.new(http_code, http_code, body)
+        end
+
+        def build_error
+          error_code, error_message =
+            if @body.has_key?('error')
+              [@body['error']['code'], @body['error']['message']]
+            else
+              [@body['code'], @body['message']]
+            end
+          raise Utils::Exceptions::JPushResponseError.new(http_code, error_code, error_message)
+        end
+
+    end
+  end
+end

data/lib/jpush/push/audience.rb

@@ -1,55 +1,55 @@
-module JPush
-  module Push
-    class Audience
-
-      def set_tag(tags)
-        @tag = [tags].flatten
-        self
-      end
-
-      def set_tag_and(tags)
-        @tag_and = [tags].flatten
-        self
-      end
-
-      def set_tag_not(tags)
-        @tag_not = [tags].flatten
-        self
-      end
-
-      def set_alias(alis)
-        @alias = [alis].flatten
-        self
-      end
-
-      def set_registration_id(registration_ids)
-        @registration_id = [registration_ids].flatten
-        self
-      end
-
-      def set_segment(segment)
-        @segment = [segment].flatten
-        self
-      end
-
-      def set_abtest(abtest)
-        @abtest = [abtest].flatten
-        self
-      end
-
-      def to_hash
-        @audience = {
-          tag: @tag,
-          tag_and: @tag_and,
-          tag_not: @tag_not,
-          alias: @alias,
-          registration_id: @registration_id,
-          segment: @segment,
-          abtest: @abtest
-        }.select { |_, value| !value.nil? }
-        @audience
-      end
-
-    end
-  end
-end
+module JPush
+  module Push
+    class Audience
+
+      def set_tag(tags)
+        @tag = [tags].flatten
+        self
+      end
+
+      def set_tag_and(tags)
+        @tag_and = [tags].flatten
+        self
+      end
+
+      def set_tag_not(tags)
+        @tag_not = [tags].flatten
+        self
+      end
+
+      def set_alias(alis)
+        @alias = [alis].flatten
+        self
+      end
+
+      def set_registration_id(registration_ids)
+        @registration_id = [registration_ids].flatten
+        self
+      end
+
+      def set_segment(segment)
+        @segment = [segment].flatten
+        self
+      end
+
+      def set_abtest(abtest)
+        @abtest = [abtest].flatten
+        self
+      end
+
+      def to_hash
+        @audience = {
+          tag: @tag,
+          tag_and: @tag_and,
+          tag_not: @tag_not,
+          alias: @alias,
+          registration_id: @registration_id,
+          segment: @segment,
+          abtest: @abtest
+        }.select { |_, value| !value.nil? }
+        @audience
+      end
+
+    end
+  end
+end

data/lib/jpush/push/notification.rb

@@ -1,66 +1,66 @@
-module JPush
-  module Push
-    class Notification
-
-      def set_alert(alert)
-        @alert = alert
-        self
-      end
-
-      def set_not_alert
-        @alert = ''
-        self
-      end
-
-      def set_android(alert: , title: nil, builder_id: nil, channel_id: nil,
-        priority: nil, category: nil, style: nil, alert_type: nil, big_text: nil, inbox: nil, big_pic_path: nil, extras: nil,
-        large_icon: nil, intent: nil)
-        @android = {
-          alert: alert,
-          title: title,
-          builder_id: builder_id,
-          channel_id: channel_id,
-          priority: priority,
-          category: category,
-          style: style,
-          alert_type: alert_type,
-          big_text: big_text,
-          inbox: inbox,
-          big_pic_path: big_pic_path,
-          extras: extras,
-          large_icon: large_icon,
-          intent: intent
-        }.select { |_, value| !value.nil? }
-        self
-      end
-
-      def set_ios(alert: , sound: nil, badge: '+1', available: nil, category:nil, extras: nil, contentavailable: nil, mutablecontent: nil, thread: nil)
-        contentavailable = available if contentavailable.nil?
-        contentavailable = nil unless contentavailable.is_a? TrueClass
-        mutablecontent = nil unless mutablecontent.is_a? TrueClass
-        @ios = {
-          alert: alert,
-          sound: sound,
-          badge: badge,
-          'content-available': contentavailable,
-          'mutable-content': mutablecontent,
-          category: category,
-          extras: extras,
-          'thread-id': thread
-        }.select { |_, value| !value.nil? }
-        self
-      end
-
-      def to_hash
-        @notification = {
-          alert: @alert,
-          android: @android,
-          ios: @ios
-        }.select { |_, value| !value.nil? }
-        raise Utils::Exceptions::JPushError, 'Notification can not be empty.' if @notification.empty?
-        @notification
-      end
-
-    end
-  end
-end
+module JPush
+  module Push
+    class Notification
+
+      def set_alert(alert)
+        @alert = alert
+        self
+      end
+
+      def set_not_alert
+        @alert = ''
+        self
+      end
+
+      def set_android(alert: , title: nil, builder_id: nil, channel_id: nil,
+        priority: nil, category: nil, style: nil, alert_type: nil, big_text: nil, inbox: nil, big_pic_path: nil, extras: nil,
+        large_icon: nil, intent: nil)
+        @android = {
+          alert: alert,
+          title: title,
+          builder_id: builder_id,
+          channel_id: channel_id,
+          priority: priority,
+          category: category,
+          style: style,
+          alert_type: alert_type,
+          big_text: big_text,
+          inbox: inbox,
+          big_pic_path: big_pic_path,
+          extras: extras,
+          large_icon: large_icon,
+          intent: intent
+        }.select { |_, value| !value.nil? }
+        self
+      end
+
+      def set_ios(alert: , sound: nil, badge: '+1', available: nil, category:nil, extras: nil, contentavailable: nil, mutablecontent: nil, thread: nil)
+        contentavailable = available if contentavailable.nil?
+        contentavailable = nil unless contentavailable.is_a? TrueClass
+        mutablecontent = nil unless mutablecontent.is_a? TrueClass
+        @ios = {
+          alert: alert,
+          sound: sound,
+          badge: badge,
+          'content-available': contentavailable,
+          'mutable-content': mutablecontent,
+          category: category,
+          extras: extras,
+          'thread-id': thread
+        }.select { |_, value| !value.nil? }
+        self
+      end
+
+      def to_hash
+        @notification = {
+          alert: @alert,
+          android: @android,
+          ios: @ios
+        }.select { |_, value| !value.nil? }
+        raise Utils::Exceptions::JPushError, 'Notification can not be empty.' if @notification.empty?
+        @notification
+      end
+
+    end
+  end
+end