aliyun-log 0.2.0 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc759f537d07276e59933f681a0014ae89066e65c98b236c70e541f52173d85
-  data.tar.gz: a3fcb9eff51e48f11b3b578e47cbfc878d3796f0f9c1b0ad5ffa0638f9024ff6
+  metadata.gz: b0d96cc9d1e5e1a2bee7cdcbca04043f3a80e8b733b1be820aac363b31f8ec34
+  data.tar.gz: 2769ddbdd8d54f257e02d12813d207fbb920c50659977a42527d6f714b45b818
 SHA512:
-  metadata.gz: e7a836e5dc43c44fc22a22304fa1a140d0b230fde3047271fb65a70f8c866dfc0ec014e86b12666f2ce9cb7de73487038cab63698e5a21a6a423d7f69f8a3419
-  data.tar.gz: 46e1132a1d9a81af0e2279a6f847abe73f2c23265a7aea018f289b63b85a6bdfa6a5415031c1df45087c8aca8f1e61b02e22a6ce76f8e4e0401278673893962e
+  metadata.gz: 2a3c0526d83176a4b34e111744ebac7cd0543fc1396462f0299dcda7c43ce31b12fb7b8ebb08898a08edddaa684ea16e3288d1985add5f35eaf61cc8ca4222e8
+  data.tar.gz: d658a42dd7aff881cb7cc9b31374af83417533185cca1c3e4b8763ec4c52bd85bd22749f4b5130dede0b42fdca0ec84663db469c5a9893d126cd9b49972fb198

data/lib/aliyun/log/common/logging.rb

@@ -38,7 +38,7 @@ module Aliyun
         def self.logger
           unless @logger
             @logger = Logger.new(
-              @log_file ||= Config.log_file, MAX_NUM_LOG, ROTATE_SIZE
+              @log_file ||= Config.log_file || IO::NULL, MAX_NUM_LOG, ROTATE_SIZE
             )
             @logger.level = Logging.logger_level
           end

data/lib/aliyun/log/config.rb

@@ -7,8 +7,8 @@ module Aliyun
       @endpoint = 'https://cn-beijing.log.aliyuncs.com'
       @open_timeout = 10
       @read_timeout = 120
-      @log_file = 'aliyun_log.log'
-      @log_level = Logger::DEBUG
+      @log_level = Logger::WARN
+      @log_file = STDOUT
       @timestamps = true
       class << self
         attr_accessor :endpoint, :access_key_id, :access_key_secret,

data/lib/aliyun/log/logstore.rb

@@ -30,13 +30,7 @@ module Aliyun
       end
 
       def put_log(attributes)
-        contents = attributes.map { |k, v| { key: k.to_s, value: v.to_s } }
-        log = Aliyun::Log::Protobuf::Log.new(
-          time: Time.now.to_i,
-          contents: contents
-        )
-        log_group = Aliyun::Log::Protobuf::LogGroup.new(logs: [log])
-        put_logs(log_group)
+        @protocol.put_log(project_name, name, attributes)
       end
 
       def get_logs(opts = {})

data/lib/aliyun/log/logtail.rb

@@ -0,0 +1,13 @@
+module Aliyun
+	module Log
+		class LogTail < Common::AttrStruct
+			attrs :name, :log_type, :log_path, :file_pattern, :localstore, :time_format,
+						:log_begin_regex, :regex, :key, :topic_format,
+						:filterKey, :filter_regex, :file_encoding
+      def initialize(opts, protocol)
+        super(opts)
+        @protocol = protocol
+      end
+		end
+	end
+end

data/lib/aliyun/log/protocol.rb

@@ -108,7 +108,7 @@ module Aliyun
       def build_log_pb(attrs, time = Time.now.to_i)
         logs = attrs.is_a?(Array) ? attrs : [attrs]
         logs.map do |log_attr|
-          contents = log_attr.compact.map { |k, v| { key: k, value: v.to_s } }
+          contents = log_attr.map { |k, v| { key: k, value: v.to_s } }
           Protobuf::Log.new(time: time, contents: contents)
         end
       end
@@ -182,7 +182,7 @@ module Aliyun
           keys: {}
         }
         fields.each do |k, v|
-          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].blank?
+          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].nil?
           body[:keys][k] = v
         end
         @http.post({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)
@@ -196,7 +196,7 @@ module Aliyun
           keys: {}
         }
         fields.each do |k, v|
-          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].blank?
+          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].nil?
           body[:keys][k] = v
         end
         @http.put({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)

data/lib/aliyun/log/record.rb

@@ -9,7 +9,7 @@ require 'forwardable'
 require_relative 'record/exception'
 require_relative 'record/field'
 require_relative 'record/persistence'
-require_relative 'record/relation'
+require_relative 'record/scoping'
 
 module Aliyun
   module Log
@@ -27,45 +27,30 @@ module Aliyun
 
         Log.included_models << self unless Log.included_models.include? self
 
-        field :created_at, :text if Config.timestamps
+        field :created_at, type: :text, cast_type: :datetime if Config.timestamps
 
         define_model_callbacks :save, :create, :initialize
 
-        after_initialize :set_created_at
+        before_save :set_created_at
       end
 
       include Field
       include Persistence
+      include Scoping
 
       include ActiveModel::AttributeMethods
 
       module ClassMethods
         def logstore(options = {})
-          if options[:timestamps] && !Config.timestamps
+          opt = options.dup
+          if opt[:timestamps] && !Config.timestamps
             field :created_at, :text
-          elsif options[:timestamps] == false && Config.timestamps
+          elsif opt[:timestamps] == false && Config.timestamps
             remove_field :created_at
           end
-          self._schema_load = true if options[:auto_sync] == false
-          self.options = options
-        end
-
-        Relation.instance_methods(false).each do |method|
-          define_method(method) do |args|
-            relation.public_send(method, args)
-          end
-        end
-
-        %i[count load result].each do |method|
-          define_method(method) do
-            relation.public_send(method)
-          end
-        end
-
-        private
-
-        def relation
-          Relation.new(self)
+          self._schema_load = true if opt[:auto_sync] == false
+          opt[:field_doc_value] = opt[:field_doc_value] != false
+          self.options = opt
         end
       end
 
@@ -101,7 +86,7 @@ module Aliyun
                        end.compact.join(', ')
                      else
                        'not initialized'
-        end
+                     end
 
         "#<#{self.class} #{inspection}>"
       end

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

@@ -4,6 +4,7 @@ module Aliyun
       class ArgumentError < StandardError; end
       class UnknownAttributeError < StandardError; end
       class ProjectNameError < StandardError; end
+      class ParseStatementInvalid < StandardError; end
     end
   end
 end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
-require "active_support"
-require "active_support/time"
-require "active_support/core_ext"
-require "active_model"
+
+require_relative 'type_casting'
 
 module Aliyun
   module Log
@@ -22,13 +20,16 @@ module Aliyun
 
         included do
           class_attribute :attributes, instance_accessor: false, default: {}
+          extend Common::Logging
         end
 
         module ClassMethods
-          def field(name, type = :text, options = {})
+          def field(name, options = {})
+            type = options[:type] || :text
             unless PERMITTED_KEY_TYPES.include?(type)
               raise ArgumentError, "Field #{name} type(#{type}) error, key type only support text/long/double/json"
             end
+
             named = name.to_s
             self.attributes = attributes.merge(name => { type: type }.merge(options))
 
@@ -36,7 +37,7 @@ module Aliyun
             warn_about_method_overriding("#{named}=", name)
             warn_about_method_overriding("#{named}?", name)
 
-            define_attribute_method(name) # Dirty API
+            define_attribute_method(name)
 
             generated_methods.module_eval do
               define_method(named) { read_attribute(named) }
@@ -64,7 +65,6 @@ module Aliyun
               remove_method field
               remove_method :"#{field}="
               remove_method :"#{field}?"
-              remove_method :"#{field}_before_type_cast"
             end
           end
 
@@ -80,7 +80,8 @@ module Aliyun
 
           def warn_about_method_overriding(method_name, field_name)
             if instance_methods.include?(method_name.to_sym)
-              Common::Logging.logger.warn("Method #{method_name} generated for the field #{field_name} overrides already existing method")
+              logger.warn("Method #{method_name} generated for the field #{field_name} " \
+                          'overrides already existing method')
             end
           end
         end
@@ -106,7 +107,7 @@ module Aliyun
         attr_accessor :attributes
 
         def write_attribute(name, value)
-          attributes[name.to_sym] = value
+          attributes[name.to_sym] = TypeCasting.cast_field(value, self.class.attributes[name.to_sym])
         end
 
         alias []= write_attribute
@@ -117,7 +118,7 @@ module Aliyun
         alias [] read_attribute
 
         def set_created_at
-          self.created_at ||= DateTime.now.in_time_zone(Time.zone).to_s if timestamps_enabled?
+          self.created_at ||= DateTime.now.in_time_zone(Time.zone).iso8601 if timestamps_enabled?
         end
 
         def timestamps_enabled?

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

@@ -8,7 +8,8 @@ module Aliyun
 
         module ClassMethods
           def logstore_name
-            @logstore_name ||= options[:name] || base_class.name.split('::').last.downcase.pluralize
+            @logstore_name ||= options[:name] ||
+                               base_class.name.split('::').last.underscore.pluralize
           end
 
           def logstore_name=(value)
@@ -55,9 +56,8 @@ module Aliyun
           def create(data, opts = {})
             auto_load_schema
             if data.is_a?(Array)
-              logs = []
-              data.each do |log_attr|
-                logs << new(log_attr).save_array
+              logs = data.map do |log_attr|
+                new(log_attr).save_array
               end
               res = Log.record_connection.put_log(project_name, logstore_name, logs, opts)
               res.code == 200
@@ -79,10 +79,10 @@ module Aliyun
           end
 
           def field_indices
-            if options[:field_index] == true
-              attributes.reject { |_, value| value[:index] == false }
-            else
+            if options[:field_index] == false
               attributes.select { |_, value| value[:index] == true }
+            else
+              attributes.reject { |_, value| value[:index] == false }
             end
           end
 
@@ -97,18 +97,38 @@ module Aliyun
           def update_index
             conf_res = Log.record_connection.get_index(project_name, logstore_name)
             raw_conf = JSON.parse(conf_res)
-            index_conf = raw_conf.dup
-            field_indices.each do |k, v|
-              index_conf['keys'][k.to_s] ||= v
+            index_conf = raw_conf.deep_dup
+            field_index_types.each do |k, v|
+              index_conf['keys'][k.to_s] ||= {}
+              index_conf['keys'][k.to_s].merge!(v.as_json)
             end
             return if index_conf['keys'] == raw_conf['keys']
 
             Log.record_connection.update_index(
               project_name,
               logstore_name,
-              index_conf['keys']
+              index_conf['keys'].with_indifferent_access
             )
           end
+
+          def field_index_types
+            field_indices.tap do |tap|
+              tap.each do |_, v|
+                v[:alias] ||= ''
+                v[:caseSensitive] ||= false
+                v[:chn] ||= false
+                v[:doc_value] = options[:field_doc_value] != false if v[:doc_value].nil?
+              end
+            end
+          end
+        end
+
+        def dump_attributes
+          attributes.dup.tap do |tap|
+            tap.each do |k, v|
+              tap[k] = TypeCasting.dump_field(v, self.class.attributes[k])
+            end
+          end
         end
 
         def save
@@ -116,7 +136,11 @@ module Aliyun
           run_callbacks(:create) do
             run_callbacks(:save) do
               if valid?
-                res = Log.record_connection.put_log(self.class.project_name, self.class.logstore_name, attributes)
+                res = Log.record_connection.put_log(
+                  self.class.project_name,
+                  self.class.logstore_name,
+                  dump_attributes
+                )
                 res.code == 200
               else
                 false
@@ -128,7 +152,7 @@ module Aliyun
         def save_array
           run_callbacks(:create) do
             run_callbacks(:save) do
-              validate! && attributes
+              validate! && dump_attributes
             end
           end
         end

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

@@ -8,7 +8,49 @@ module Aliyun
           @klass = klass
           @opts = opts
           @klass.auto_load_schema
-          @opts[:search] ||= '*'
+        end
+
+        def inspect
+          "#<#{self.class}>"
+        end
+
+        def first(line = 1)
+          find_offset(0, line, false)
+        end
+
+        def second
+          find_offset(1)
+        end
+
+        def third
+          find_offset(2)
+        end
+
+        def fourth
+          find_offset(3)
+        end
+
+        def fifth
+          find_offset(4)
+        end
+
+        def last(line = 1)
+          find_offset(0, line, true)
+        end
+
+        def find_offset(nth, line = 1, reverse = false)
+          @opts[:line] = line
+          @opts[:offset] = nth
+          @opts[:reverse] = reverse
+          line <= 1 ? load[0] : load
+        end
+
+        def scoping
+          previous = @klass.current_scope
+          @klass.current_scope = self
+          yield
+        ensure
+          @klass.current_scope = previous
         end
 
         def from(from)
@@ -44,13 +86,18 @@ module Aliyun
           self
         end
 
-        def search(str)
-          @opts[:search] = str
+        def search(*statement)
+          ql = statement_ql(*statement)
+          @opts[:search] = ql if ql.present?
           self
         end
 
-        def sql(str)
-          @opts[:sql] = str
+        def sql(*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
 
@@ -77,7 +124,7 @@ module Aliyun
             query[:line] ||= 100
             query[:offset] = query[:page] * query[:line]
           end
-          query[:query] = query[:search]
+          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)
@@ -85,11 +132,131 @@ module Aliyun
 
         def load
           result.map do |json_attr|
-            attrs = {}
-            @klass.attributes.keys.each do |k, _|
-              attrs[k] = json_attr[k.to_s]
+            record = @klass.new
+            json_attr.each do |key, value|
+              record.send("#{key}=", value) if record.respond_to?("#{key}=")
+            end
+            record
+          end
+        end
+
+        private
+
+        def statement_ql(*statement)
+          if statement.size == 1
+            sanitize_hash(statement.first)
+          elsif statement.size > 1
+            sanitize_array(*statement)
+          end
+        end
+
+        def sanitize_hash(search_content)
+          return search_content unless search_content.is_a?(Hash)
+
+          search_content.select { |_, v| v.present? }.map do |key, value|
+            options = @klass.attributes[:"#{key}"]
+            unless options
+              raise UnknownAttributeError, "unknown field '#{key}' for #{@klass.name}."
+            end
+
+            raise_if_hash_quote(value)
+
+            cast_type = options[:cast_type]
+            if value.is_a?(Array)
+              values = value.uniq.map { |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
+              "#{key}: #{_quote(cast_type, value)}"
+            end
+          end.join(' AND ')
+        end
+
+        def sanitize_array(*ary)
+          statement, *values = ary
+          if values.first.is_a?(Hash) && /:\w+/.match?(statement)
+            replace_named_bind_variables(statement, values.first)
+          elsif statement.include?('?')
+            replace_bind_variables(statement, values)
+          elsif statement.blank? || values.blank?
+            statement
+          else
+            statement % values.collect(&:to_s)
+          end
+        end
+
+        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)
+              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
-            @klass.new(attrs)
+          end
+        end
+
+        def replace_bind_variables(statement, values)
+          expected = statement.count('?')
+          provided = values.size
+          if expected != provided
+            raise ParseStatementInvalid, "wrong number of bind variables (#{provided} " \
+                                         "for #{expected}) in: #{statement}"
+          end
+          bound = values.dup
+          statement.gsub(/\?/) do
+            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.dump_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'               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
+
+        def method_missing(method, *args, &block)
+          if @klass.respond_to?(method)
+            scoping { @klass.public_send(method, *args, &block) }
+          else
+            super
           end
         end
       end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Aliyun
+  module Log
+    module PerThreadRegistry
+      def self.extended(object)
+        object.instance_variable_set '@per_thread_registry_key', object.name.freeze
+      end
+
+      def instance
+        Thread.current[@per_thread_registry_key] ||= new
+      end
+
+      private
+
+      def method_missing(name, *args, &block)
+        singleton_class.delegate name, to: :instance
+
+        send(name, *args, &block)
+      end
+    end
+
+    class ScopeRegistry
+      extend PerThreadRegistry
+
+      def initialize
+        @registry = Hash.new { |hash, key| hash[key] = {} }
+      end
+
+      def value_for(scope_type, model)
+        @registry[scope_type][model.name]
+      end
+
+      # Sets the +value+ for a given +scope_type+ and +model+.
+      def set_value_for(scope_type, model, value)
+        @registry[scope_type][model.name] = value
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative 'scope_registry'
+require_relative 'relation'
+
+module Aliyun
+  module Log
+    module Record
+      module Scoping
+        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 :first, :last, :second, :third, :fourth, :fifth, :find_offset, to: :all
+
+          def current_scope
+            ScopeRegistry.value_for(:current_scope, self)
+          end
+
+          def current_scope=(scope)
+            ScopeRegistry.set_value_for(:current_scope, self, scope)
+          end
+
+          def scope(name, body)
+            raise ArgumentError, 'The scope body needs to be callable.' unless body.respond_to?(:call)
+
+            singleton_class.send(:define_method, name) do |*args|
+              scope = all
+              scope = scope.scoping { body.call(*args) }
+              scope
+            end
+          end
+
+          def unscoped
+            block_given? ? relation.scoping { yield } : relation
+          end
+
+          def all
+            scope = current_scope
+            scope ||= relation.from(0).to(Time.now.to_i)
+            scope
+          end
+
+          private
+
+          def relation
+            Relation.new(self)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,191 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Aliyun
+  module Log
+    module Record
+      module TypeCasting
+        TYPE_MAPPING = {
+          text: :string,
+          long: :integer,
+          double: :bigdecimal,
+          json: :json
+        }.freeze
+
+        def self.cast_field(value, options)
+          options ||= {}
+          type = options[:cast_type]
+          type ||= TYPE_MAPPING[options[:type]]
+
+          return value if options.nil?
+          return nil if value.nil?
+
+          caster = Registry.lookup(type)
+          raise ArgumentError, "Unknown type #{options[:type]}" if caster.nil?
+
+          caster.new(options).cast(value)
+        end
+
+        def self.dump_field(value, options)
+          options ||= {}
+          type = options[:cast_type]
+          type ||= TYPE_MAPPING[options[:type]]
+
+          return value if options.nil?
+          return nil if value.nil?
+
+          dumper = Registry.lookup(type)
+          raise ArgumentError, "Unknown type #{options[:type]}" if dumper.nil?
+
+          dumper.new(options).dump(value)
+        end
+
+        class Value
+          def initialize(options)
+            @options = options
+          end
+
+          def cast(value)
+            value
+          end
+
+          def dump(value)
+            value
+          end
+        end
+
+        class StringType < Value; end
+
+        class DateType < Value
+          def cast(value)
+            return nil unless value.respond_to?(:to_date)
+
+            value.to_date
+          end
+
+          def dump(value)
+            if value.respond_to?(:to_date)
+              value.to_date.to_s
+            else
+              value.to_s
+            end
+          end
+        end
+
+        class DateTimeType < Value
+          def cast(value)
+            return nil unless value.respond_to?(:to_datetime)
+
+            dt = begin
+                   ::DateTime.parse(value)
+                 rescue StandardError
+                   nil
+                 end
+            if dt
+              seconds = string_utc_offset(value) || 0
+              offset = seconds_to_offset(seconds)
+              ::DateTime.new(dt.year, dt.mon, dt.mday, dt.hour, dt.min, dt.sec, offset)
+            else
+              value.to_datetime
+            end
+          end
+
+          def dump(value)
+            if value.respond_to?(:to_datetime)
+              value.to_datetime.iso8601
+            else
+              value.to_s
+            end
+          end
+
+          private
+
+          def string_utc_offset(string)
+            Date._parse(string)[:offset]
+          end
+
+          def seconds_to_offset(seconds)
+            ActiveSupport::TimeZone.seconds_to_utc_offset(seconds)
+          end
+        end
+
+        class IntegerType < Value
+          def cast(value)
+            if value == true
+              1
+            elsif value == false
+              0
+            elsif value.is_a?(String) && value.blank?
+              nil
+            elsif value.is_a?(Float) && !value.finite?
+              nil
+            elsif !value.respond_to?(:to_i)
+              nil
+            else
+              value.to_i
+            end
+          end
+        end
+
+        class BigDecimalType < Value
+          def cast(value)
+            if value == true
+              1
+            elsif value == false
+              0
+            elsif value.is_a?(Symbol)
+              value.to_s.to_d
+            elsif value.is_a?(String) && value.blank?
+              nil
+            elsif value.is_a?(Float) && !value.finite?
+              nil
+            elsif !value.respond_to?(:to_d)
+              nil
+            else
+              value.to_d
+            end
+          end
+        end
+
+        class JsonType < Value
+          def cast(value)
+            return value unless value.is_a?(String)
+
+            begin
+              ActiveSupport::JSON.decode(value)
+            rescue StandardError
+              nil
+            end
+          end
+
+          def dump(value)
+            ActiveSupport::JSON.encode(value) unless value.nil?
+          end
+        end
+
+        module Registry
+          module_function
+
+          @registrations = {}
+
+          def register(name, klass = nil)
+            @registrations[name.to_sym] = klass
+          end
+
+          def lookup(name)
+            name ||= :string
+            @registrations[name.to_sym]
+          end
+
+          register(:string, StringType)
+          register(:date, DateType)
+          register(:datetime, DateTimeType)
+          register(:bigdecimal, BigDecimalType)
+          register(:integer, IntegerType)
+          register(:json, JsonType)
+        end
+      end
+    end
+  end
+end

data/lib/aliyun/log/request.rb

@@ -83,7 +83,7 @@ module Aliyun
         end
 
         logger.debug("Received HTTP response, code: #{response.code}, headers: " \
-                      "#{response.headers}, body: #{response.body}")
+                      "#{response.headers}, body: #{response.body.force_encoding('UTF-8')}")
 
         response
       end

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
   module Log
-    VERSION = '0.2.0'
+    VERSION = '0.2.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.10
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -114,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Aliyun Log SDK for Ruby 阿里云日志服务(SLS) Ruby SDK, 目前仅实现基于Restfull部分接口
+description: Aliyun Log SDK for Ruby 阿里云日志服务(SLS) Ruby SDK, 目前仅实现基于Restfull部分接口和简单Model映射
 email:
 - yingce@live.com
 executables: []
@@ -128,6 +128,7 @@ files:
 - lib/aliyun/log/common/logging.rb
 - lib/aliyun/log/config.rb
 - lib/aliyun/log/logstore.rb
+- lib/aliyun/log/logtail.rb
 - lib/aliyun/log/project.rb
 - lib/aliyun/log/protobuf.rb
 - lib/aliyun/log/protocol.rb
@@ -136,6 +137,9 @@ files:
 - lib/aliyun/log/record/field.rb
 - lib/aliyun/log/record/persistence.rb
 - lib/aliyun/log/record/relation.rb
+- lib/aliyun/log/record/scope_registry.rb
+- lib/aliyun/log/record/scoping.rb
+- lib/aliyun/log/record/type_casting.rb
 - lib/aliyun/log/request.rb
 - lib/aliyun/log/server_error.rb
 - lib/aliyun/version.rb