jpush 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d83dfc03c68eb6ee9aa5f6186fa6a852d6d732f
-  data.tar.gz: 0099414451636b14b1863761575777a2f73d5212
+  metadata.gz: ed64db7a7f39cfedce9b5e9749209e434399114e
+  data.tar.gz: '0058d231e5b2d8fe1b748d319b0833b55bfeb9c1'
 SHA512:
-  metadata.gz: fb2db9530810cea2a30f0a7374674fe7fc0a4530a1db80cbfecc3b1d7ff3d317d400b0857a0529f5e1823650e655b69183b5da52e682ce93d94ede62a5e2d48a
-  data.tar.gz: da5cd810d4246bd8b833c0a081dd934bcaf6495479b1f3d199dfc7c5ef37a0a245ffd65b6fddf57cc24ff89a5112dcb4061fc82d4ac4da54bad5c95c9e34f14c
+  metadata.gz: cc7a28529a4a9f57c3eea2c64af47415f63b62604d173dd4aa7b0a82c4eb19b130a2d0b077d1f74f4d121575d1875be86bdcd9244de709b68405883322022c94
+  data.tar.gz: e59538d72132c8180f563eb72e62d18de34867912a3ee0d609f535f6e2272fb79662d576c2c20e5f09bc70b1582bccd66183753fbe8894bd256d6ad808fbe2ba

data/README.md

@@ -1,5 +1,3 @@
-[![](http://community.jpush.cn/uploads/default/original/1X/a1dbd54304178079e65cdc36810fdf528fdebe24.png)](http://community.jpush.cn/)
-
 # JPush API Ruby Client
 
 [![Build Status](https://travis-ci.org/jpush/jpush-api-ruby-client.svg?branch=master)](https://travis-ci.org/jpush/jpush-api-ruby-client)

data/lib/jpush.rb

@@ -4,7 +4,6 @@ module JPush
   # Your code goes here...
   require 'jpush/api'
   require 'jpush/config'
-  require 'jpush/utils/helper'
   require 'jpush/utils/http'
 
 end

data/lib/jpush/device.rb

@@ -1,16 +1,12 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/http/client'
 
 module JPush
   module Device
     extend self
-    extend Helper::ArgumentHelper
-    using Utils::Helper::ObjectExtensions
 
     # GET /v3/devices/{registration_id}
     # 获取当前设备的所有属性
     def show(registration_id)
-      check_registration_id(registration_id)
       url = base_url + registration_id
       Http::Client.get(url)
     end
@@ -18,25 +14,20 @@ module JPush
     # 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)
-      check_registration_id(registration_id)
-      check_mobile(mobile) unless mobile.nil?
-      check_alias(alis) unless alis.nil?
       tags =
         if clear_tags
-          ''
+            ''
         else
-          tags_add = build_tags(tags_add) unless tags_add.nil?
-          tags_remove = build_tags(tags_remove) unless tags_remove.nil?
-          tags = { add: tags_add, remove: tags_remove }.compact
-          tags.empty? ? nil : tags
+          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
-      }.compact
-
-      raise Utils::Exceptions::JPushError, 'Devices update body can not be empty' if body.empty?
+      }.select { |_, value| !value.nil? }
 
       url = base_url + registration_id
       Http::Client.post(url, body: body)
@@ -70,7 +61,7 @@ module JPush
     # 获取用户在线状态
     # POST /v3/devices/status/
     def status(registration_ids)
-      registration_ids = build_registration_ids(registration_ids)
+      registration_ids = [registration_ids].flatten
       url = base_url + 'status'
       body = { registration_ids: registration_ids }
       Http::Client.post(url, body: body)
@@ -87,8 +78,6 @@ module JPush
 
   module Tag
     extend self
-    extend Helper::ArgumentHelper
-    using Utils::Helper::ObjectExtensions
 
     # GET /v3/tags/
     # 获取当前应用的所有标签列表。
@@ -100,8 +89,6 @@ module JPush
     # GET /v3/tags/{tag_value}/registration_ids/{registration_id}
     # 查询某个设备是否在 tag 下
     def has_device?(tag_value, registration_id)
-      check_registration_id(registration_id)
-      check_tag(tag_value)
       url = base_url + "#{tag_value}/registration_ids/#{registration_id}"
       Http::Client.get(url)
     end
@@ -109,15 +96,11 @@ module JPush
     # POST /v3/tags/{tag_value}
     # 为一个标签添加或者删除设备。
     def update(tag_value, devices_add: nil, devices_remove: nil)
-      check_tag(tag_value)
-
-      devices_add = build_registration_ids(devices_add) unless devices_add.nil?
-      devices_remove = build_registration_ids(devices_remove) unless devices_remove.nil?
-      registration_ids = { add: devices_add, remove: devices_remove }.compact
+      rids = {}
+      rids[:add] = [devices_add].flatten unless devices_add.nil?
+      rids[:remove] = [devices_remove].flatten unless devices_remove.nil?
 
-      raise Utils::Exceptions::JPushError, 'Tags update body can not be empty.' if registration_ids.empty?
-
-      body = { registration_ids: registration_ids }
+      body = { registration_ids: rids }
       url = base_url + tag_value
       Http::Client.post(url, body: body)
     end
@@ -134,8 +117,7 @@ module JPush
     # DELETE /v3/tags/{tag_value}
     # 删除一个标签，以及标签与设备之间的关联关系
     def delete(tag_value, platform = nil)
-      check_tag(tag_value)
-      params = platform.nil? ? nil : { platform: build_platform(platform) }
+      params = platform.nil? ? nil : { platform: [platform].flatten.join(',') }
       url = base_url + tag_value
       Http::Client.delete(url, params: params)
     end
@@ -151,12 +133,10 @@ module JPush
 
   module Alias
     extend self
-    extend Helper::ArgumentHelper
 
     # GET /v3/aliases/{alias_value}
     # 获取指定alias下的设备，最多输出10个
     def show(alias_value, platform = nil)
-      check_alias(alias_value)
       params = platform.nil? ? nil : { platform: build_platform(platform) }
       url = base_url + alias_value
       Http::Client.get(url, params: params)
@@ -165,7 +145,6 @@ module JPush
     # DELETE /v3/aliases/{alias_value}
     # 删除一个别名，以及该别名与设备的绑定关系
     def delete(alias_value, platform = nil)
-      check_alias(alias_value)
       params = platform.nil? ? nil : { platform: build_platform(platform) }
       url = base_url + alias_value
       Http::Client.delete(url, params: params)
@@ -177,6 +156,10 @@ module JPush
         Config.settings[:device_api_host] + Config.settings[:api_version] + '/aliases/'
       end
 
+      def build_platform(p)
+        [p].flatten.join(',')
+      end
+
   end
 
 end

data/lib/jpush/http/response.rb

@@ -7,15 +7,7 @@ module JPush
       def initialize(raw_response)
         @http_code = raw_response.code.to_i
         @body = parse_body(raw_response.body)
-
-        unless raw_response.kind_of? Net::HTTPSuccess
-          begin
-            build_error
-          rescue Utils::Exceptions::VIPAppKeyError => e
-            puts "\nVIPAppKeyError: #{e}"
-            puts "\t#{e.backtrace.join("\n\t")}"
-          end
-        end
+        build_error unless raw_response.kind_of? Net::HTTPSuccess
       end
 
       private
@@ -33,13 +25,7 @@ module JPush
             else
               [@body['code'], @body['message']]
             end
-
-          case error_code
-          when 2003
-            raise Utils::Exceptions::VIPAppKeyError.new(http_code, error_code, error_message)
-          else
-            raise Utils::Exceptions::JPushResponseError.new(http_code, error_code, error_message)
-          end
+          raise Utils::Exceptions::JPushResponseError.new(http_code, error_code, error_message)
         end
 
     end

data/lib/jpush/push.rb

@@ -1,16 +1,14 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/push/push_payload'
 require 'jpush/http/client'
 
 module JPush
   module Push
     extend self
-    extend Helper::ArgumentHelper
 
     # POST https://api.jpush.cn/v3/push/validate
     # 验证推送调用是否能够成功，与推送 API 的区别在于：不向用户发送任何消息
     def validate(push_payload)
-      url =  base_url + 'validate'
+      url = base_url + 'validate'
       send_push(url, push_payload)
     end
 

data/lib/jpush/push/audience.rb

@@ -1,28 +1,24 @@
-require 'jpush/helper/argument_helper'
-
 module JPush
   module Push
     class Audience
-      extend Helper::ArgumentHelper
-      using Utils::Helper::ObjectExtensions
 
       def set_tag(tags)
-        @tag = Audience.build_tags(tags, 20)
+        @tag = [tags].flatten
         self
       end
 
       def set_tag_and(tags)
-        @tag_and = Audience.build_tags(tags, 20)
+        @tag_and = [tags].flatten
         self
       end
 
       def set_alias(alis)
-        @alias = Audience.build_alias(alis)
+        @alias = [alis].flatten
         self
       end
 
       def set_registration_id(registration_ids)
-        @registration_id = Audience.build_registration_ids(registration_ids)
+        @registration_id = [registration_ids].flatten
         self
       end
 
@@ -32,8 +28,7 @@ module JPush
           tag_and: @tag_and,
           alias: @alias,
           registration_id: @registration_id
-        }.compact
-        raise Utils::Exceptions::JPushError, 'Audience can not be empty.' if @audience.empty?
+        }.select { |_, value| !value.nil? }
         @audience
       end
 

data/lib/jpush/push/notification.rb

@@ -1,15 +1,8 @@
-require 'jpush/helper/argument_helper'
-
 module JPush
   module Push
     class Notification
-      extend Helper::ArgumentHelper
-      using Utils::Helper::ObjectExtensions
-
-      MAX_IOS_NOTIFICATION_SIZE = 2000
 
       def set_alert(alert)
-        Notification.ensure_argument_not_blank('alert': alert)
         @alert = alert
         self
       end
@@ -21,7 +14,6 @@ module JPush
 
       def set_android(alert: , title: nil, builder_id: nil,
         priority: nil, category: nil, style: nil, big_text: nil, inbox: nil, big_pic_path: nil, extras: nil)
-        extras = Notification.build_extras(extras)
         @android = {
           alert: alert,
           title: title,
@@ -33,13 +25,12 @@ module JPush
           inbox: inbox,
           big_pic_path: big_pic_path,
           extras: extras
-        }.compact
+        }.select { |_, value| !value.nil? }
         self
       end
 
       def set_ios(alert: , sound: nil, badge: '+1', available: nil, category:nil, extras: nil, contentavailable: nil, mutablecontent: nil)
         contentavailable = available if contentavailable.nil?
-        extras = Notification.build_extras(extras)
         contentavailable = nil unless contentavailable.is_a? TrueClass
         mutablecontent = nil unless mutablecontent.is_a? TrueClass
         @ios = {
@@ -50,8 +41,7 @@ module JPush
           'mutable-content': mutablecontent,
           category: category,
           extras: extras
-        }.compact
-        Notification.ensure_not_over_bytesize('ios', {'ios': @ios}, MAX_IOS_NOTIFICATION_SIZE)
+        }.select { |_, value| !value.nil? }
         self
       end
 
@@ -60,7 +50,7 @@ module JPush
           alert: @alert,
           android: @android,
           ios: @ios
-        }.compact
+        }.select { |_, value| !value.nil? }
         raise Utils::Exceptions::JPushError, 'Notification can not be empty.' if @notification.empty?
         @notification
       end

data/lib/jpush/push/push_payload.rb

@@ -1,14 +1,10 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/push/audience'
 require 'jpush/push/notification'
 
 module JPush
   module Push
     class PushPayload
-      extend Helper::ArgumentHelper
-      using Utils::Helper::ObjectExtensions
 
-      VALID_OPTION_KEY = [:sendno, :time_to_live, :override_msg_id, :apns_production, :big_push_duration]
       MAX_SMS_CONTENT_SIZE = 480
       MAX_SMS_DELAY_TIME = 86400    # 24 * 60 * 60 (second)
 
@@ -30,14 +26,11 @@ module JPush
       end
 
       def set_options(opts)
-        @options = build_options(opts)
+        @options = opts
         self
       end
 
       def to_hash
-        raise Utils::Exceptions::MissingArgumentError.new(['audience']) unless @audience
-        err_msg = 'missing notification or message'
-        raise Utils::Exceptions::JPushError, err_msg unless @notification || @message
         @push_payload =  {
           platform: @platform,
           audience: @audience,
@@ -45,13 +38,14 @@ module JPush
           message: @message,
           sms_message: @sms_message,
           options: { apns_production: false }.merge(@options.nil? ? {} : @options)
-        }.compact
+        }.select { |_, value| !value.nil? }
       end
 
       private
 
         def build_platform(platform)
-          PushPayload.build_platform(platform)
+          return platform if platform.is_a? Array
+          return [platform]
         end
 
         def build_audience(audience)
@@ -64,30 +58,20 @@ module JPush
         end
 
         def build_message(msg_content, title = nil, content_type = nil, extras = nil)
-          hash = {'msg_content': msg_content, 'title': title, 'content_type': content_type}.select{|key, value| !value.nil?}
-          PushPayload.ensure_argument_not_blank(hash)
-          extras = PushPayload.build_extras(extras)
+          extras = (extras.nil? || !extras.is_a?(Hash) || extras.empty?) ? nil : extras
           message = {
             msg_content: msg_content,
             title: title,
             content_type: content_type,
             extras: extras
-          }.compact
+          }.select { |_, value| !value.nil? }
         end
 
         def build_sms_message(content, delay_time)
-          PushPayload.ensure_argument_not_blank('content': content)
-          PushPayload.ensure_not_over_size('content', content, MAX_SMS_CONTENT_SIZE)
           delay_time = 0 if delay_time > MAX_SMS_DELAY_TIME
           {content: content, delay_time: delay_time}
         end
 
-        def build_options(opts)
-          opts.each_key do |key|
-            raise Utils::Exceptions::InvalidElementError.new('options', key.to_sym, VALID_OPTION_KEY) unless VALID_OPTION_KEY.include?(key.to_sym)
-          end
-        end
-
     end
   end
 end

data/lib/jpush/report.rb

@@ -1,10 +1,8 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/http/client'
 
 module JPush
   module Report
     extend self
-    extend Helper::ArgumentHelper
 
     TIME_UNIT = ['HOUR', 'DAY', 'MONTH']
     TIME_FORMAT = { hour: '%F %H', day: '%F', month: '%Y-%m' }
@@ -13,7 +11,7 @@ module JPush
     # GET /v3/received
     # 送达统计
     def received(msg_ids)
-      msg_ids = build_msg_ids(msg_ids)
+      msg_ids = [msg_ids].flatten
       url = base_url + '/received'
       params = {
         msg_ids: msg_ids.join(',')
@@ -24,7 +22,7 @@ module JPush
     # GET /v3/messages
     # 消息统计
     def messages(msg_ids)
-      msg_ids = build_msg_ids(msg_ids)
+      msg_ids = [msg_ids].flatten
       url = base_url + '/messages'
       params = {
         msg_ids: msg_ids.join(',')
@@ -35,7 +33,6 @@ module JPush
     # GET /v3/users
     # 用户统计
     def users(time_unit, start, duration)
-      raise Utils::Exceptions::InvalidElementError.new('time unit', time_unit, TIME_UNIT) unless TIME_UNIT.include?(time_unit.upcase)
       start = start.strftime(TIME_FORMAT[time_unit.downcase.to_sym])
       duration = build_duration(time_unit.downcase.to_sym, duration)
       params = {

data/lib/jpush/schedule.rb

@@ -1,4 +1,3 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/schedule/schedule_payload'
 require 'jpush/http/client'
 
@@ -6,7 +5,6 @@ module JPush
 
   module Schedule
     extend self
-    extend Helper::ArgumentHelper
 
     # POST https://api.jpush.cn/v3/schedules
     # 创建一个新的定时任务

data/lib/jpush/schedule/schedule_payload.rb

@@ -1,15 +1,12 @@
-require 'jpush/helper/argument_helper'
 require 'jpush/push/push_payload'
 require 'jpush/schedule/trigger'
 
 module JPush
   module Schedule
     class SchedulePayload
-      extend Helper::ArgumentHelper
-      using Utils::Helper::ObjectExtensions
 
       def initialize(name, trigger, push_payload, enabled = nil)
-        @name = build_name(name)
+        @name = name
         @trigger = build_trigger(trigger)
         @push_payload = build_push_payload(push_payload)
         @enabled = enabled
@@ -21,7 +18,7 @@ module JPush
           enabled: @enabled,
           trigger: @trigger,
           push: @push_payload
-        }.compact
+        }.select { |_, value| !value.nil? }
         raise Utils::Exceptions::JPushError, 'Schedule update body can not be empty' if @schedule_payload.empty?
         @schedule_payload
       end
@@ -34,15 +31,9 @@ module JPush
           push: @push_payload
         }
         hash = @schedule_payload.select { |_, value| value.nil? }
-        raise Utils::Exceptions::MissingArgumentError.new(hash.keys) unless hash.empty?
         @schedule_payload
       end
 
-      def build_name(name)
-        SchedulePayload.ensure_word_valid('name', name) unless name.nil?
-        name
-      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

data/lib/jpush/schedule/trigger.rb

@@ -1,12 +1,7 @@
-require 'jpush/helper/argument_helper'
-
 module JPush
   module Schedule
     class Trigger
-      extend Helper::ArgumentHelper
-      using Utils::Helper::ObjectExtensions
 
-      TIME_UNIT = ['MONTH', 'WEEK', 'DAY']
       WEEK = ['MON','TUE','WED','THU','FRI','SAT','SUN']
       MDAY = ('01'..'31').to_a
 
@@ -18,7 +13,6 @@ module JPush
 
       def set_periodical(start_time, end_time, time, time_unit, frequency, point)
         @single = nil
-        raise Utils::Exceptions::InvalidElementError.new('time unit', time_unit, TIME_UNIT) unless TIME_UNIT.include?(time_unit.upcase)
         require 'time'
         frequency = 100 if frequency > 100
         @periodical = {
@@ -33,11 +27,9 @@ module JPush
       end
 
       def to_hash
-        @trigger = {
-          single: @single,
-          periodical: @periodical
-        }.compact
-        raise Utils::Exceptions::JPushError, 'Trigger can not be empty.' if @trigger.empty?
+        @trigger = {}
+        @trigger[:single] = @single unless @single.nil?
+        @trigger[:periodical] = @periodical unless @periodical.nil?
         @trigger
       end
 
@@ -54,7 +46,6 @@ module JPush
             when 'MONTH'
               MDAY & array
             end
-          raise Utils::Exceptions::InvalidArgumentError.new([], "invalid point") if point.empty?
         end
 
     end

data/lib/jpush/utils/exceptions.rb

@@ -1,9 +1,6 @@
-require 'jpush/utils/helper'
-
 module JPush
   module Utils
     module Exceptions
-      using Utils::Helper::ObjectExtensions
 
       class JPushError < StandardError
         attr_reader :message
@@ -12,50 +9,12 @@ module JPush
         end
       end
 
-      class JPushArgumentError < JPushError
-      end
-
-      class MissingArgumentError < JPushArgumentError
-        def initialize(missed_args)
-          list = missed_args.map {|arg| arg.to_s} * (', ')
-          msg = "#{list} are required."
-          super(msg)
-        end
-      end
-
-      class InvalidArgumentError < JPushArgumentError
-        def initialize(invalid_args, msg = nil)
-          list = invalid_args.map {|arg| arg.to_s} * (', ')
-          msg ||= "#{list} can not be blank."
-          super(msg)
-        end
-      end
-
-      class InvalidWordError < JPushError
-        def initialize(name, word)
-          super("invalid #{name}: #{word} ( #{name} can only contain letters, numbers,
-            '_', Chinese character and special characters(@!#$&*+=.|))")
-        end
-      end
-
-      class InvalidElementError < JPushError
-        def initialize(name, invalid_element, list)
-          super("invalid #{name}: #{invalid_element} ( #{name} only support #{list * (', ')} )")
-        end
-      end
-
-      class OverLimitError < JPushError
-        def initialize(name, limit, unit)
-          super("#{name} must have at most #{limit} #{unit}")
-        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.blank?
+          @error_message = "UnknownError[#{@http_code}]." if @error_message.nil?
           super("#{@error_message} (error code: #{@error_code}) ")
         end
 
@@ -64,12 +23,6 @@ module JPush
         end
       end
 
-      class VIPAppKeyError < JPushResponseError
-        def initialize(http_code, error_code, error_message)
-          super(http_code, error_code, error_message)
-        end
-      end
-
       class TimeOutError < JPushError
         def initialize(error)
           super("#{error.class} was raised, please rescue it")

data/lib/jpush/utils/http.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'json'
+require 'jpush/utils/exceptions'
 
 module JPush
   module Utils

data/lib/jpush/version.rb

@@ -1,3 +1,3 @@
 module JPush
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpush
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - JPush Offical
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,8 +74,6 @@ files:
 - lib/jpush/api.rb
 - lib/jpush/config.rb
 - lib/jpush/device.rb
-- lib/jpush/helper/argument.rb
-- lib/jpush/helper/argument_helper.rb
 - lib/jpush/http/client.rb
 - lib/jpush/http/response.rb
 - lib/jpush/push.rb
@@ -87,7 +85,6 @@ files:
 - lib/jpush/schedule/schedule_payload.rb
 - lib/jpush/schedule/trigger.rb
 - lib/jpush/utils/exceptions.rb
-- lib/jpush/utils/helper.rb
 - lib/jpush/utils/http.rb
 - lib/jpush/version.rb
 homepage: https://github.com/jpush/jpush-api-ruby-client

data/lib/jpush/helper/argument.rb

@@ -1,78 +0,0 @@
-require 'jpush/utils/helper'
-require 'jpush/utils/exceptions'
-
-module JPush
-  module Helper
-    module Argument
-      using Utils::Helper::ObjectExtensions
-
-      MOBILE_RE = /^(1[34578])(\d{9})$/
-
-      MAX_ALIAS_BYTESIZE = 40
-      MAX_TAG_BYTESIZE = 40
-
-      def check_registration_id(registration_id)
-        ensure_argument_not_blank('registration id': registration_id)
-      end
-
-      def check_mobile(mobile)
-        raise Utils::Exceptions::InvalidArgumentError.new([], "invalid mobile") unless MOBILE_RE === mobile
-      end
-
-      def check_alias(alis)
-        return '' == alis
-        ensure_word_valid('alias', alis)
-        ensure_not_over_bytesize('alias', alis, MAX_ALIAS_BYTESIZE)
-      end
-
-      def check_tag(tag)
-        ensure_word_valid('tag', tag)
-        ensure_not_over_bytesize('tag', tag, MAX_TAG_BYTESIZE)
-      end
-
-      def check_platform(platform)
-        valid_platform = JPush::Config.settings[:valid_platform]
-        raise Utils::Exceptions::InvalidElementError.new('platform', platform, valid_platform) unless valid_platform.include?(platform)
-      end
-
-      def ensure_argument_not_blank(args)
-        invalid_args = args.select{|key, value| value.blank?}
-        raise Utils::Exceptions::InvalidArgumentError.new(invalid_args.keys) unless invalid_args.empty?
-      end
-
-      def ensure_argument_required(args)
-        missing_args = args.select{|key, value| value.nil?}
-        raise Utils::Exceptions::MissingArgumentError.new(missing_args.keys) unless missing_args.empty?
-      end
-
-      def ensure_not_over_bytesize(name, value, max_bytesize)
-        bytesize =
-          if value.respond_to? :bytesize
-            value.bytesize
-          else
-            size = value.to_json.bytesize if value.is_a? Hash
-            size = value.inject(0){|r, e| r += e.bytesize} if value.is_a? Array
-            size
-          end
-        raise Utils::Exceptions::OverLimitError.new(name, max_bytesize, 'bytes') if bytesize > max_bytesize
-      end
-
-      def ensure_not_over_size(name, value, max_size)
-        size = value.size
-        unit =
-          if value.is_a? String
-            'characters'
-          else
-            'items'
-          end
-        raise Utils::Exceptions::OverLimitError.new(name, max_size, unit) if size > max_size
-      end
-
-      # 有效的 tag alias 组成: 字母(区分大小写), 数字, 下划线, 汉字, 特殊字符(@!#$&*+=.|)
-      def ensure_word_valid(name, word)
-        raise Utils::Exceptions::InvalidWordError.new(name, word) unless word.valid_word?
-      end
-
-    end
-  end
-end

data/lib/jpush/helper/argument_helper.rb

@@ -1,59 +0,0 @@
-require 'jpush/helper/argument'
-require 'jpush/utils/helper'
-
-module JPush
-  module Helper
-    module ArgumentHelper
-      extend Argument
-      using Utils::Helper::ObjectExtensions
-
-      MAX_TAG_ARRAY_SZIE = 100
-      MAX_ALIAS_ARRAY_SIZE = 1000
-      MAX_REGISTRATION_ID_ARRAY_SIZE = 1000
-      MAX_TAG_ARRAY_MAX_BYTESIZE = 1024
-      MAX_MSG_IDS_ARRAY_SIZE = 100
-
-      def self.extended(base)
-        base.extend Argument
-      end
-
-      def build_tags(tags, max_size = MAX_TAG_ARRAY_SZIE)
-        tags = build_args_from_array_or_string('tags', tags, max_size)
-        ensure_not_over_bytesize('tags', tags, MAX_TAG_ARRAY_MAX_BYTESIZE)
-        tags
-      end
-
-      def build_registration_ids(ids)
-        build_args_from_array_or_string('registration ids', ids, MAX_REGISTRATION_ID_ARRAY_SIZE)
-      end
-
-      def build_alias(alis)
-        build_args_from_array_or_string('alias', alis, MAX_ALIAS_ARRAY_SIZE)
-      end
-
-      def build_msg_ids(msg_ids)
-        build_args_from_array_or_string('msg ids', msg_ids, MAX_MSG_IDS_ARRAY_SIZE)
-      end
-
-      def build_extras(extras)
-        (extras.nil? || !extras.is_a?(Hash) || extras.empty?) ? nil : extras
-      end
-
-      def build_platform(platform)
-        [platform].flatten.each{ |pf| check_platform(pf) }
-      end
-
-
-      private
-
-        def build_args_from_array_or_string(args_name, args_value, max_size)
-          # remove blank elements in args array
-          args = [args_value].flatten.compact.reject{ |arg| arg.blank? }.uniq
-          ensure_argument_not_blank(args_name.to_sym => args)
-          ensure_not_over_size(args_name, args, max_size)
-          args.each{|word| ensure_word_valid(args_name, word)}
-        end
-
-    end
-  end
-end

data/lib/jpush/utils/helper.rb

@@ -1,48 +0,0 @@
-module JPush
-  module Utils
-    module Helper
-      module ObjectExtensions
-
-        refine Object do
-
-          def jpush_symbolize_keys!
-            return self.inject({}){ |memo, (k, v)| memo[k.to_sym] = v.jpush_symbolize_keys!; memo } if self.is_a? Hash
-            return self.inject([]){ |memo, v     | memo          << v.jpush_symbolize_keys!; memo } if self.is_a? Array
-            return self
-          end
-
-          # An object is blank if it's false, empty, or a whitespace string.
-          # For example, false, '', ' ', nil, [], and {} are all blank.
-          def blank?
-            respond_to?(:empty?) ? !!empty? : !self
-          end
-
-        end
-
-        refine String do
-          BLANK_RE = /\A[[:space:]]*\z/
-          WORD_RE = /\A[\p{han}a-zA-Z0-9_@!#&=|\$\*\+\.]+\z/u
-
-          def titleize
-            self.split(' ').map(&:capitalize).join(' ')
-          end
-
-          def blank?
-            BLANK_RE === self
-          end
-
-          def valid_word?
-            WORD_RE === self
-          end
-        end
-
-        refine Hash do
-          def compact
-            self.select { |_, value| !value.nil? }
-          end
-        end
-
-      end
-    end
-  end
-end