aliyun-log 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b389451492d70d3427b9a940de87c2166d862ac543f882b97a3924e31b51e92c
-  data.tar.gz: 6f8d17bad66ed46c0a8da7e514c10cfaa1198418e48e7d2f03be8f8de499d16d
+  metadata.gz: 5d6574ee8e72a65c178f4cdc28c61e63379999e51166c95756b9ffd6b367f47a
+  data.tar.gz: 8fdce159cd971c94c966b20db9926653a16e4bd5efaee918f619a6f0bf00a9e8
 SHA512:
-  metadata.gz: 1c68ba2d18b987e36c96187a7007ede440af4f0beb36748e49ce213872f57dd5db78dfb82ed63c4f9ee5f87b558daa4fc0686b13e71533ba4d3dc6fdaa3333ae
-  data.tar.gz: 3ce13d9720545a7394a0b64b2b6adb78f196dd83a554f7b872a57460e29dac5dd2876a5a528c7c728c537ece778bc4913900b0487856dd65c7d563ff5f0045ee
+  metadata.gz: 13ce9aed0a16e0c0a47fe8baadc45215967fd33cef33bece8bdfca0148a565155f347860d3bf986091b965419e04d513e19756c87b6f52ac32879188f07f3a11
+  data.tar.gz: f7c441bdb8ae2f3a768b236fb1bc8b86ad0c4965324b9323142565d50ed776b632ff11ba2036af7b1d1058968daeabe14080f792cbf2d438c777a6f4a25f17cf

data/lib/aliyun/log.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'version'
 require_relative 'log/common'
 require_relative 'log/client'
 require_relative 'log/config'

data/lib/aliyun/log/protobuf.rb

@@ -16,11 +16,17 @@ module Aliyun
         repeated Content, :contents, 2
       end
 
+      class LogTag < ::Protobuf::Message
+        required :string, :key, 1
+        required :string, :value, 2
+      end
+
       class LogGroup < ::Protobuf::Message
         repeated Log, :logs, 1
         optional :string, :reserved, 2
         optional :string, :topic, 3
         optional :string, :source, 4
+        repeated LogTag, :log_tags, 6
       end
     end
   end

data/lib/aliyun/log/record.rb

@@ -4,7 +4,7 @@ require 'active_support'
 require 'active_support/time'
 require 'active_support/core_ext'
 require 'active_model'
-require 'forwardable'
+require 'monitor'
 
 require_relative 'record/exception'
 require_relative 'record/field'
@@ -22,16 +22,21 @@ module Aliyun
 
         class_attribute :options, instance_accessor: false, default: {}
         class_attribute :base_class, instance_accessor: false, default: self
-        class_attribute :log_connection, instance_accessor: false
         class_attribute :_schema_load, default: false
 
         Log.included_models << self unless Log.included_models.include? self
 
+        field :__time__, type: :long, cast_type: :integer
+        field :__topic__
+        field :__source__
+
         field :created_at, type: :text, cast_type: :datetime if Config.timestamps
 
         define_model_callbacks :save, :create, :initialize
 
         before_save :set_created_at
+
+        @lock = Monitor.new
       end
 
       include Field
@@ -79,6 +84,10 @@ module Aliyun
         end
       end
 
+      def new_record?
+        @new_record == true
+      end
+
       def inspect
         inspection = if defined?(@attributes) && @attributes
                        self.class.attributes.keys.collect do |name|

data/lib/aliyun/log/record/field.rb

@@ -20,6 +20,7 @@ module Aliyun
 
         included do
           class_attribute :attributes, instance_accessor: false, default: {}
+          class_attribute :tag_attributes, instance_accessor: false, default: {}
           extend Common::Logging
         end
 
@@ -31,7 +32,11 @@ module Aliyun
             end
 
             named = name.to_s
-            self.attributes = attributes.merge(name => { type: type }.merge(options))
+            if options[:log_tag]
+              self.tag_attributes = tag_attributes.merge(name => { type: type }.merge(options))
+            else
+              self.attributes = attributes.merge(name => { type: type }.merge(options))
+            end
 
             warn_about_method_overriding(name, name)
             warn_about_method_overriding("#{named}=", name)

data/lib/aliyun/log/record/persistence.rb

@@ -4,6 +4,14 @@ module Aliyun
   module Log
     module Record
       module Persistence
+        RESERVED_FIELDS = %i[
+          __time__
+          __topic__
+          __source__
+          __partition_time__
+          __extract_others__
+        ].freeze
+
         extend ActiveSupport::Concern
 
         module ClassMethods
@@ -35,15 +43,17 @@ module Aliyun
           end
 
           def sync_index
+            return if field_indices.blank?
             has_index? ? update_index : create_index
           end
 
           def auto_load_schema
-            return if _schema_load
-
-            create_logstore
-            sync_index
-            self._schema_load = true
+            @lock.synchronize do
+              return if _schema_load
+              create_logstore
+              sync_index
+              self._schema_load = true
+            end
           end
 
           def has_index?
@@ -53,19 +63,23 @@ module Aliyun
             false
           end
 
-          def create(data, opts = {})
+          def create(data, force = false)
             auto_load_schema
             if data.is_a?(Array)
-              logs = data.map do |log_attr|
-                new(log_attr).save_array
+              # TODO batch insert
+              data.each do |log|
+                saved = new(log).save(force)
+                return false unless saved
               end
-              res = Log.record_connection.put_log(project_name, logstore_name, logs, opts)
-              res.code == 200
             else
-              new(data).save
+              new(data).save(force)
             end
           end
 
+          def create!(data)
+            create(data, true)
+          end
+
           private
 
           def evaluate_default_value(val)
@@ -79,11 +93,12 @@ module Aliyun
           end
 
           def field_indices
-            if options[:field_index] == false
-              attributes.select { |_, value| value[:index] == true }
-            else
-              attributes.reject { |_, value| value[:index] == false }
-            end
+            indices = if options[:field_index] == false
+                        attributes.select { |_, value| value[:index] == true }
+                      else
+                        attributes.reject { |_, value| value[:index] == false }
+                      end
+            indices.reject { |key, _| RESERVED_FIELDS.include?(key) }
           end
 
           def create_index
@@ -99,6 +114,7 @@ module Aliyun
             raw_conf = JSON.parse(conf_res)
             index_conf = raw_conf.deep_dup
             field_index_types.each do |k, v|
+              index_conf['keys'] ||= {}
               index_conf['keys'][k.to_s] ||= {}
               index_conf['keys'][k.to_s].merge!(v.as_json)
             end
@@ -123,38 +139,68 @@ module Aliyun
           end
         end
 
+        def dump_log_tags
+          log_tags = {}
+          self.class.tag_attributes.map do |key, options|
+            log_tags[key] = TypeCasting.dump_field(attributes[key], options)
+          end
+          log_tags.compact
+        end
+
         def dump_attributes
           attributes.dup.tap do |tap|
             tap.each do |k, v|
-              tap[k] = TypeCasting.dump_field(v, self.class.attributes[k])
+              if self.class.attributes[k][:log_tag] || RESERVED_FIELDS.include?(k)
+                tap.delete(k)
+              else
+                tap[k] = TypeCasting.dump_field(v, self.class.attributes[k])
+              end
             end
           end
         end
 
-        def save
+        def save(force = false)
           self.class.auto_load_schema
           run_callbacks(:create) do
             run_callbacks(:save) do
-              if valid?
-                res = Log.record_connection.put_log(
-                  self.class.project_name,
-                  self.class.logstore_name,
-                  dump_attributes
-                )
-                res.code == 200
-              else
-                false
-              end
+              force && validate!
+              return false unless valid?
+              saved = put_logs
+              @new_record = false if saved
+              saved
             end
           end
         end
 
-        def save_array
-          run_callbacks(:create) do
-            run_callbacks(:save) do
-              validate! && dump_attributes
-            end
-          end
+        def save!
+          save(true)
+        end
+
+        private
+
+        def put_logs
+          log_tags = []
+          dump_log_tags.each do |k, v|
+            log_tags << Protobuf::LogTag.new(key: k, value: v)
+          end
+          lg = Protobuf::LogGroup.new(
+            logs: [generate_log],
+            log_tags: log_tags,
+            topic: read_attribute(:__topic__),
+            source: read_attribute(:__source__)
+          )
+          res = Log.record_connection.put_logs(
+            self.class.project_name,
+            self.class.logstore_name,
+            lg
+          )
+          res.code == 200
+        end
+
+        def generate_log
+          time = read_attribute(:__time__) || Time.now.to_i
+          contents = dump_attributes.map { |k, v| { key: k, value: v.to_s } }
+          Protobuf::Log.new(time: time, contents: contents)
         end
       end
     end

data/lib/aliyun/log/record/relation.rb

@@ -10,9 +10,9 @@ module Aliyun
           @klass.auto_load_schema
         end
 
-        # def inspect
-        #   "#<#{self.class}>"
-        # end
+        def inspect
+          "#<#{self.class}>"
+        end
 
         def first(line = 1)
           find_offset(0, line, false)
@@ -35,14 +35,28 @@ module Aliyun
         end
 
         def last(line = 1)
-          find_offset(0, line, true)
+          data = find_offset(0, line, true)
+          line > 1 ? data.reverse : data
         end
 
         def find_offset(nth, line = 1, reverse = false)
+          # @opts[:select] = '*'
           @opts[:line] = line
           @opts[:offset] = nth
-          @opts[:reverse] = reverse
-          line <= 1 ? load[0] : load
+          if @opts[:order].present? && reverse
+            conds = []
+            @opts[:order].split(',').each do |field|
+              field.gsub!(/\s+desc|asc.*/i, '')
+              conds << "#{field.strip} DESC"
+            end
+            @opts[:order] = conds.join(', ')
+          end
+          @opts[:order] ||= reverse ? '__time__ DESC' : '__time__ ASC'
+          if @opts[:select].blank?
+            line <= 1 ? load[0] : load
+          else
+            line <= 1 ? result[0] : result
+          end
         end
 
         def scoping
@@ -78,10 +92,16 @@ module Aliyun
 
         def page(val)
           @opts[:page] = val - 1 if val >= 1
+          singleton_class.send(:define_method, :total_count) do
+            @total_count ||= count
+          end
+          singleton_class.send(:define_method, :total_pages) do
+            (total_count.to_f / (@opts[:line] || 100)).ceil
+          end
           self
         end
 
-        def where(opts)
+        def api(opts)
           @opts.merge!(opts)
           self
         end
@@ -93,11 +113,49 @@ module Aliyun
         end
 
         def sql(*statement)
-          ql = statement_ql(*statement)
+          unless statement[0].is_a?(String)
+            raise ParseStatementInvalid, 'Only support string statement'
+          end
+          ql = sanitize_array(*statement)
           @opts[:sql] = ql if ql.present?
           self
         end
 
+        def where(*statement)
+          if statement[0].is_a?(String)
+            ql = sanitize_array(*statement)
+            @opts[:where] = ql
+          else
+            ql = statement_ql(*statement)
+            @opts[:search] = ql
+          end
+          self
+        end
+
+        def select(*fields)
+          @opts[:select] = fields.join(', ')
+          self
+        end
+
+        def group(*fields)
+          @opts[:group] = fields.join(', ')
+          self
+        end
+
+        def order(*fields)
+          if fields[0].is_a?(Hash)
+            @opts[:order] = fields[0].map do |k, v|
+              unless %w[asc desc].include?(v.to_s)
+                raise ArgumentError, "Direction \"#{v}\" is invalid. Valid directions are: [:asc, :desc, :ASC, :DESC]" 
+              end
+              "#{k} #{v}"
+            end.join(', ')
+          else
+            @opts[:order] = fields.join(', ')
+          end
+          self
+        end
+
         def query(opts = {})
           @opts[:query] = opts
           self
@@ -105,26 +163,38 @@ module Aliyun
 
         def count
           query = @opts.dup
-          if query[:query].blank?
-            where_cond = query[:sql].split(/where /i)[1] if query[:sql].present?
-            query[:query] = "#{query[:search]}|SELECT COUNT(*) as count"
-            query[:query] = "#{query[:query]} WHERE #{where_cond}" if where_cond.present?
+          if query[:select].blank?
+            @opts[:select] = 'COUNT(*) as count'
+            sql = to_sql
+          else
+            _sql = to_sql
+            sql = "SELECT COUNT(*) as count"
+            sql += " FROM(#{_sql})" if _sql.present?
           end
-          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
-          res = JSON.parse(res.body)
-          res[0]['count'].to_i
+          query[:query] = "#{query[:search] || '*'}|#{sql}"
+          res = execute(query)
+          res.dig(0, 'count').to_i
+        end
+
+        def sum(field)
+          @opts[:select] = "SUM(#{field}) as sum"
+          query = @opts.dup
+          query[:query] = "#{query[:search] || '*'}|#{to_sql}"
+          res = execute(query)
+          res.dig(0, 'sum').to_f
         end
 
         def result
           query = @opts.dup
-          if query[:page]
-            query[:line] ||= 100
-            query[:offset] = query[:page] * query[:line]
-          end
           query[:query] = query[:search] || '*'
-          query[:query] = "#{query[:query]}|#{query[:sql]}" if query[:sql].present?
-          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
-          JSON.parse(res)
+          sql = to_sql
+          if sql.present?
+            query[:query] += "|#{sql}"
+            @opts[:line] = nil
+            @opts[:offset] = nil
+            @opts[:page] = nil
+          end
+          execute(query)
         end
 
         def load
@@ -137,8 +207,38 @@ module Aliyun
           end
         end
 
+        def to_sql
+          return @opts[:sql] if @opts[:sql].present?
+          opts = @opts.dup
+          sql_query = []
+          sql_query << "WHERE #{opts[:where]}" if opts[:where].present?
+          sql_query << "GROUP BY #{opts[:group]}" if opts[:group].present?
+          sql_query << "ORDER BY #{opts[:order]}" if opts[:order].present?
+          if sql_query.present? || opts[:select].present?
+            sql_query.insert(0, "SELECT #{opts[:select] || '*'}")
+            sql_query.insert(1, 'FROM log') unless opts[:select]&.match?(/from\s+log/i)
+            if opts[:line] || opts[:page] || opts[:offset]
+              parse_page
+              sql_query << "LIMIT #{@opts[:offset]},#{@opts[:line]}"
+            end
+          end
+          "#{opts[:query]}#{sql_query.join(' ')}"
+        end
+
         private
 
+        def execute(query)
+          puts query.slice(:from, :to, :search, :query).to_json
+          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
+          JSON.parse(res)
+        end
+
+        def parse_page
+          @opts[:line] ||= 100
+          @opts[:page] ||= 0
+          @opts[:offset] = @opts[:page] * @opts[:line]
+        end
+
         def statement_ql(*statement)
           if statement.size == 1
             sanitize_hash(statement.first)
@@ -150,12 +250,28 @@ module Aliyun
         def sanitize_hash(search_content)
           return search_content unless search_content.is_a?(Hash)
 
-          search_content.select { |_, v| v.present? }.map do |key, value|
-            unless @klass.attributes[:"#{key}"]
+          search_content.reject { |_, v| v.nil? }.map do |key, value|
+            options = @klass.attributes[:"#{key}"]
+            unless options
               raise UnknownAttributeError, "unknown field '#{key}' for #{@klass.name}."
             end
 
-            "#{key}: #{value}"
+            raise_if_hash_quote(value)
+
+            cast_type = options[:cast_type]
+
+            is_tag = @klass.tag_attributes[:"#{key}"]
+            key = :"__tag__:#{key}" if is_tag
+            if value.is_a?(Array)
+              values = value.uniq.map { |v| is_tag ? v : _quote(cast_type, v) }
+              str_values = values.map { |v| "#{key}: #{v}" }.join(' OR ')
+              values.size > 1 ? "(#{str_values})" : str_values
+            elsif value.is_a?(Range)
+              "#{key} in [#{value.begin} #{value.end}]"
+            else
+              quote_value = is_tag ? value : _quote(cast_type, value)
+              "#{key}: #{quote_value}"
+            end
           end.join(' AND ')
         end
 
@@ -165,7 +281,7 @@ module Aliyun
             replace_named_bind_variables(statement, values.first)
           elsif statement.include?('?')
             replace_bind_variables(statement, values)
-          elsif statement.blank?
+          elsif statement.blank? || values.blank?
             statement
           else
             statement % values.collect(&:to_s)
@@ -175,7 +291,14 @@ module Aliyun
         def replace_named_bind_variables(statement, bind_vars)
           statement.gsub(/(:?):([a-zA-Z]\w*)/) do |match|
             if bind_vars.include?(match = Regexp.last_match(2).to_sym)
-              "'#{bind_vars[match]}'"
+              match_value = bind_vars[match]
+              raise_if_hash_quote(match_value)
+              if match_value.is_a?(Array) || match_value.is_a?(Range)
+                values = match_value.map { |v| _quote_type_value(v) }
+                values.join(', ')
+              else
+                _quote_type_value(match_value)
+              end
             else
               raise ParseStatementInvalid, "missing value for :#{match} in #{statement}"
             end
@@ -191,7 +314,42 @@ module Aliyun
           end
           bound = values.dup
           statement.gsub(/\?/) do
-            "'#{bound.shift}'"
+            value = bound.shift
+            raise_if_hash_quote(value)
+            if value.is_a?(Array) || value.is_a?(Range)
+              values = value.map { |v| _quote_type_value(v) }
+              values.join(', ')
+            else
+              _quote_type_value(value)
+            end
+          end
+        end
+
+        def _quote(type, value)
+          v = TypeCasting.cast_field(value, cast_type: type || :string)
+          case type
+          when :string, nil then "'#{v.to_s}'"
+          when :bigdecimal  then v.to_s("F")
+          when :integer     then v.to_s.to_i
+          when :datetime, :date then "'#{v.iso8601}'"
+          else
+            value.to_s
+          end
+        end
+
+        def _quote_type_value(value)
+          case value.class.name
+          when 'String'                   then "'#{value.to_s}'"
+          when 'BigDecimal', 'Float'      then value.to_s("F")
+          when 'Date', 'DateTime', 'Time' then "'#{value.iso8601}'"
+          else
+            value
+          end
+        end
+
+        def raise_if_hash_quote(value)
+          if value.is_a?(Hash) || value.is_a?(ActiveSupport::HashWithIndifferentAccess)
+            raise ParseStatementInvalid, "can't quote Hash"
           end
         end
 

data/lib/aliyun/log/record/scoping.rb

@@ -10,9 +10,10 @@ module Aliyun
         extend ActiveSupport::Concern
 
         module ClassMethods
-          delegate :load, :result, :count, to: :all
-          delegate :where, :query, :search, :sql, :from, :to,
-                   :page, :line, :limit, :offset, to: :all
+          delegate :load, :result, :count, :sum, to: :all
+          delegate :where, :query, :search, :sql, :from, :to, :api,
+                   :page, :line, :limit, :offset, :select, :group,
+                   :order, :to_sql, to: :all
           delegate :first, :last, :second, :third, :fourth, :fifth, :find_offset, to: :all
 
           def current_scope

data/lib/aliyun/log/record/type_casting.rb

@@ -9,7 +9,7 @@ module Aliyun
         TYPE_MAPPING = {
           text: :string,
           long: :integer,
-          double: :bigdecimal,
+          double: :float,
           json: :json
         }.freeze
 
@@ -55,7 +55,17 @@ module Aliyun
           end
         end
 
-        class StringType < Value; end
+        class StringType < Value
+          def cast(value)
+            if value.nil?
+              ''
+            elsif value.is_a? String
+              value.dup
+            else
+              value.to_s
+            end
+          end
+        end
 
         class DateType < Value
           def cast(value)
@@ -66,7 +76,7 @@ module Aliyun
 
           def dump(value)
             if value.respond_to?(:to_date)
-              value.to_datetime.iso8601
+              value.to_date.to_s
             else
               value.to_s
             end
@@ -148,6 +158,26 @@ module Aliyun
           end
         end
 
+        class FloatType < Value
+          def cast(value)
+            if value == true
+              1
+            elsif value == false
+              0
+            elsif value.is_a?(Symbol)
+              value.to_s.to_f
+            elsif value.is_a?(String) && value.blank?
+              nil
+            elsif value.is_a?(Float) && !value.finite?
+              nil
+            elsif !value.respond_to?(:to_f)
+              nil
+            else
+              value.to_f
+            end
+          end
+        end
+
         class JsonType < Value
           def cast(value)
             return value unless value.is_a?(String)
@@ -183,6 +213,7 @@ module Aliyun
           register(:datetime, DateTimeType)
           register(:bigdecimal, BigDecimalType)
           register(:integer, IntegerType)
+          register(:float, FloatType)
           register(:json, JsonType)
         end
       end

data/lib/aliyun/log/request.rb

@@ -7,6 +7,8 @@ require 'digest'
 require 'date'
 require 'zlib'
 
+require_relative 'utils'
+
 module Aliyun
   module Log
     class Request
@@ -16,25 +18,6 @@ module Aliyun
         @config = config
       end
 
-      def get_resource_path(resources = {})
-        resources ||= {}
-        res = '/'
-        if resources[:logstore]
-          res = "#{res}logstores"
-          res = "#{res}/#{resources[:logstore]}" unless resources[:logstore].empty?
-        end
-        res = "#{res}/#{resources[:action]}" if resources[:action]
-        res
-      end
-
-      def get_request_url(resources = {})
-        resources ||= {}
-        url = URI.parse(@config.endpoint)
-        url.host = "#{resources[:project]}." + url.host if resources[:project]
-        url.path = get_resource_path(resources)
-        url.to_s
-      end
-
       def get(resources, payload = {})
         do_request('GET', resources, payload)
       end
@@ -52,10 +35,11 @@ module Aliyun
       end
 
       def do_request(verb, resources, payload)
-        resource_path = get_resource_path(resources)
+        resource_path = Utils.get_resource_path(resources)
+        url = Utils.get_request_url(@config.endpoint, resources)
         request_options = {
           method: verb,
-          url: get_request_url(resources),
+          url: url,
           open_timeout: @config.open_timeout,
           read_timeout: @config.read_timeout
         }
@@ -75,15 +59,17 @@ module Aliyun
         response = request.execute do |resp|
           if resp.code >= 300
             e = ServerError.new(resp)
-            logger.error(e.to_s)
+            logger.error("#{e.to_s} #{resp.code} #{resp}")
             raise e
           else
             resp.return!
           end
         end
 
-        logger.debug("Received HTTP response, code: #{response.code}, headers: " \
-                      "#{response.headers}, body: #{response.body.force_encoding('UTF-8')}")
+        logger.debug("Received HTTP response, code: #{response.code}, " \
+                      "url: #{request_options[:url]}, " \
+                      "method: #{verb}, headers: #{response.headers}, " \
+                      "body: #{response.body.force_encoding('UTF-8')}")
 
         response
       end

data/lib/aliyun/log/utils.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext'
+
+module Aliyun
+  module Log
+  	module Utils
+	  	module_function
+	  	def get_resource_path(resources = {})
+	      resources ||= {}
+	      res = '/'
+	      if resources[:logstore]
+	        res = "#{res}logstores"
+	        res = "#{res}/#{resources[:logstore]}" unless resources[:logstore].empty?
+	      end
+	      res = "#{res}/#{resources[:action]}" if resources[:action]
+	      res
+	    end
+
+	    def get_request_url(endpoint, resources = {})
+	      resources ||= {}
+	      url = URI.parse(endpoint)
+	      url.host = "#{resources[:project]}." + url.host if resources[:project]
+	      url.path = get_resource_path(resources)
+	      url.to_s
+	    end
+	  end
+  end
+end

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
   module Log
-    VERSION = '0.2.8'
+    VERSION = '0.2.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.13
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Aliyun Log SDK for Ruby 阿里云日志服务(SLS) Ruby SDK, 目前仅实现基于Restfull部分接口和简单Model映射
 email:
 - yingce@live.com
@@ -141,6 +155,7 @@ files:
 - lib/aliyun/log/record/type_casting.rb
 - lib/aliyun/log/request.rb
 - lib/aliyun/log/server_error.rb
+- lib/aliyun/log/utils.rb
 - lib/aliyun/version.rb
 homepage: https://github.com/yingce/aliyun-log
 licenses: