aliyun-log 0.1.2 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8548cc01c3f9ed8368bb2e42d4436e9914b639d7c960ae652d0f851ff9c6f17
-  data.tar.gz: 59e47e2e014ec9f666fa3a105b0e03be82957b326747b122502cf8b593ac4c2d
+  metadata.gz: b389451492d70d3427b9a940de87c2166d862ac543f882b97a3924e31b51e92c
+  data.tar.gz: 6f8d17bad66ed46c0a8da7e514c10cfaa1198418e48e7d2f03be8f8de499d16d
 SHA512:
-  metadata.gz: 0bfb7b4e14d983c8e8e88bc3a5f217575928100a5c523e93588e1db816ddb37698b39e1d972d6b129f3aeddb7f66799e1b9531e58de6d7f0c43853a7065ef6a8
-  data.tar.gz: 6b4c05758679915c6c7aa8f4ac7cc1786e551c361a40d846694b5907edf3d09a2c50ac26410b29437966e2c1fa9df5d2ba8310ffe8f8f9ba7c5603dabc048794
+  metadata.gz: 1c68ba2d18b987e36c96187a7007ede440af4f0beb36748e49ce213872f57dd5db78dfb82ed63c4f9ee5f87b558daa4fc0686b13e71533ba4d3dc6fdaa3333ae
+  data.tar.gz: 3ce13d9720545a7394a0b64b2b6adb78f196dd83a554f7b872a57460e29dac5dd2876a5a528c7c728c537ece778bc4913900b0487856dd65c7d563ff5f0045ee

data/lib/aliyun/log.rb

@@ -9,11 +9,33 @@ require_relative 'log/protobuf'
 require_relative 'log/protocol'
 require_relative 'log/request'
 require_relative 'log/server_error'
+require_relative 'log/record'
 
 module Aliyun
   module Log
-    def self.configure
+    extend self
+
+    def configure
       block_given? ? yield(Config) : Config
     end
+    alias config configure
+
+    def included_models
+      @included_models ||= []
+    end
+
+    def record_connection
+      unless @record_connection
+        @record_connection = Protocol.new(Config.new)
+      end
+      @record_connection
+    end
+
+    def init_logstore
+      @included_models.each do |model|
+        model.create_logstore
+        modle.sync_index
+      end
+    end
   end
 end

data/lib/aliyun/log/client.rb

@@ -31,6 +31,10 @@ module Aliyun
       def delete_project(name)
         @protocol.delete_project(name)
       end
+
+      def get_logstore(project_name, logstore_name)
+        @protocol.get_logstore(project_name, logstore_name)
+      end
     end
   end
 end

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,11 +7,13 @@ 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,
-                      :open_timeout, :read_timeout, :log_file, :log_level
+                      :open_timeout, :read_timeout, :log_file, :log_level,
+                      :timestamps, :project
 
         def configure
           yield self

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/protocol.rb

@@ -66,7 +66,7 @@ module Aliyun
 
       def create_logstore(project_name, logstore_name, opt = {})
         body = {
-          logstore_name: logstore_name,
+          logstoreName: logstore_name,
           ttl: opt[:ttl] || 365,
           shardCount: opt[:shard_count] || 2,
           autoSplit: opt[:auto_split].nil? ? false : opt[:auto_split],
@@ -105,10 +105,17 @@ module Aliyun
         @http.post({ project: project_name, logstore: logstore_name, is_pb: true }, content)
       end
 
-      def put_log(project_name, logstore_name, log_attr)
-        contents = log_attr.compact.map { |k, v| { key: k, value: v } }
-        log_pb = Protobuf::Log.new(time: Time.now.to_i, contents: contents)
-        lg_pb = Protobuf::LogGroup.new(logs: [log_pb])
+      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.map { |k, v| { key: k, value: v.to_s } }
+          Protobuf::Log.new(time: time, contents: contents)
+        end
+      end
+
+      def put_log(project_name, logstore_name, logs, opts = {})
+        logs = build_log_pb(logs, opts[:time] || Time.now.to_i)
+        lg_pb = Protobuf::LogGroup.new(logs: logs, topic: opts[:topic])
         @http.post({ project: project_name, logstore: logstore_name, is_pb: true }, lg_pb)
       end
 
@@ -175,8 +182,8 @@ module Aliyun
           keys: {}
         }
         fields.each do |k, v|
+          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].nil?
           body[:keys][k] = v
-          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type]) && v[:token].blank?
         end
         @http.post({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)
       end
@@ -189,8 +196,8 @@ module Aliyun
           keys: {}
         }
         fields.each do |k, v|
+          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type].to_s) && v[:token].nil?
           body[:keys][k] = v
-          v[:token] = INDEX_DEFAULT_TOKEN if v[:type] == 'text' && v[:token].blank?
         end
         @http.put({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)
       end

data/lib/aliyun/log/record.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'active_support'
+require 'active_support/time'
+require 'active_support/core_ext'
+require 'active_model'
+require 'forwardable'
+
+require_relative 'record/exception'
+require_relative 'record/field'
+require_relative 'record/persistence'
+require_relative 'record/scoping'
+
+module Aliyun
+  module Log
+    module Record
+      extend ActiveSupport::Concern
+
+      included do
+        extend ActiveModel::Callbacks
+        include ActiveModel::Validations
+
+        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 :created_at, type: :text, cast_type: :datetime if Config.timestamps
+
+        define_model_callbacks :save, :create, :initialize
+
+        before_save :set_created_at
+      end
+
+      include Field
+      include Persistence
+      include Scoping
+
+      include ActiveModel::AttributeMethods
+
+      module ClassMethods
+        def logstore(options = {})
+          opt = options.dup
+          if opt[:timestamps] && !Config.timestamps
+            field :created_at, :text
+          elsif opt[:timestamps] == false && Config.timestamps
+            remove_field :created_at
+          end
+          self._schema_load = true if opt[:auto_sync] == false
+          opt[:field_doc_value] = opt[:field_doc_value] != false
+          self.options = opt
+        end
+      end
+
+      def initialize(attrs = {})
+        run_callbacks :initialize do
+          @new_record = true
+          @attributes ||= {}
+
+          attrs_with_defaults = self.class.attributes.each_with_object({}) do |(attribute, options), res|
+            res[attribute] = if attrs.key?(attribute)
+                               attrs[attribute]
+                             elsif options.key?(:default)
+                               evaluate_default_value(options[:default])
+                             end
+          end
+
+          attrs_virtual = attrs.slice(*(attrs.keys - self.class.attributes.keys))
+
+          attrs_with_defaults.merge(attrs_virtual).each do |key, value|
+            if respond_to?("#{key}=")
+              send("#{key}=", value)
+            else
+              raise UnknownAttributeError, "unknown attribute '#{key}' for #{@record.class}."
+            end
+          end
+        end
+      end
+
+      def inspect
+        inspection = if defined?(@attributes) && @attributes
+                       self.class.attributes.keys.collect do |name|
+                         "#{name}: #{attribute_for_inspect(name)}" if has_attribute?(name)
+                       end.compact.join(', ')
+                     else
+                       'not initialized'
+                     end
+
+        "#<#{self.class} #{inspection}>"
+      end
+
+      def attribute_for_inspect(attr_name)
+        value = read_attribute(attr_name)
+
+        if value.is_a?(String) && value.length > 50
+          "#{value[0, 50]}...".inspect
+        elsif value.is_a?(Date) || value.is_a?(Time)
+          %("#{value.to_s(:db)}")
+        else
+          value.inspect
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Aliyun
+  module Log
+    module Record
+      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

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require_relative 'type_casting'
+
+module Aliyun
+  module Log
+    module Record
+      module Field
+        extend ActiveSupport::Concern
+
+        # Types allowed in indexes:
+        PERMITTED_KEY_TYPES = %i[
+          text
+          long
+          double
+          json
+        ].freeze
+
+        DEFAULT_INDEX_TOKEN = ", '\";=()[]{}?@&<>/:\n\t\r".split('')
+
+        included do
+          class_attribute :attributes, instance_accessor: false, default: {}
+          extend Common::Logging
+        end
+
+        module ClassMethods
+          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))
+
+            warn_about_method_overriding(name, name)
+            warn_about_method_overriding("#{named}=", name)
+            warn_about_method_overriding("#{named}?", name)
+
+            define_attribute_method(name)
+
+            generated_methods.module_eval do
+              define_method(named) { read_attribute(named) }
+              define_method("#{named}?") do
+                value = read_attribute(named)
+                case value
+                when true        then true
+                when false, nil  then false
+                else
+                  !value.nil?
+                end
+              end
+              define_method("#{named}=") { |value| write_attribute(named, value) }
+            end
+          end
+
+          def remove_field(field)
+            field = field.to_sym
+            attributes.delete(field) || raise('No such field')
+
+            undefine_attribute_methods
+            define_attribute_methods attributes.keys
+
+            generated_methods.module_eval do
+              remove_method field
+              remove_method :"#{field}="
+              remove_method :"#{field}?"
+            end
+          end
+
+          private
+
+          def generated_methods
+            @generated_methods ||= begin
+              Module.new.tap do |mod|
+                include(mod)
+              end
+            end
+          end
+
+          def warn_about_method_overriding(method_name, field_name)
+            if instance_methods.include?(method_name.to_sym)
+              logger.warn("Method #{method_name} generated for the field #{field_name} " \
+                          'overrides already existing method')
+            end
+          end
+        end
+
+        def attribute_names
+          @attributes.keys
+        end
+
+        def has_attribute?(attr_name)
+          @attributes.key?(attr_name.to_sym)
+        end
+
+        def evaluate_default_value(val)
+          if val.respond_to?(:call)
+            val.call
+          elsif val.duplicable?
+            val.dup
+          else
+            val
+          end
+        end
+
+        attr_accessor :attributes
+
+        def write_attribute(name, value)
+          attributes[name.to_sym] = TypeCasting.cast_field(value, self.class.attributes[name.to_sym])
+        end
+
+        alias []= write_attribute
+
+        def read_attribute(name)
+          attributes[name.to_sym]
+        end
+        alias [] read_attribute
+
+        def set_created_at
+          self.created_at ||= DateTime.now.in_time_zone(Time.zone).iso8601 if timestamps_enabled?
+        end
+
+        def timestamps_enabled?
+          self.class.options[:timestamps] || (self.class.options[:timestamps].nil? && Config.timestamps)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Aliyun
+  module Log
+    module Record
+      module Persistence
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def logstore_name
+            @logstore_name ||= options[:name] ||
+                               base_class.name.split('::').last.underscore.pluralize
+          end
+
+          def logstore_name=(value)
+            if defined?(@logstore_name)
+              return if value == @logstore_name
+            end
+
+            @logstore_name = value
+          end
+
+          def project_name
+            unless @project_name
+              @project_name = options[:project] || Config.project
+              raise ProjectNameError, "project can't be empty" if @project_name.blank?
+            end
+            @project_name
+          end
+
+          def create_logstore(options = {})
+            Log.record_connection.get_logstore(project_name, logstore_name)
+          rescue ServerError => e
+            Log.record_connection.create_logstore(project_name, logstore_name, options)
+          end
+
+          def sync_index
+            has_index? ? update_index : create_index
+          end
+
+          def auto_load_schema
+            return if _schema_load
+
+            create_logstore
+            sync_index
+            self._schema_load = true
+          end
+
+          def has_index?
+            Log.record_connection.get_index(project_name, logstore_name)
+            true
+          rescue ServerError
+            false
+          end
+
+          def create(data, opts = {})
+            auto_load_schema
+            if data.is_a?(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
+            else
+              new(data).save
+            end
+          end
+
+          private
+
+          def evaluate_default_value(val)
+            if val.respond_to?(:call)
+              val.call
+            elsif val.duplicable?
+              val.dup
+            else
+              val
+            end
+          end
+
+          def field_indices
+            if options[:field_index] == false
+              attributes.select { |_, value| value[:index] == true }
+            else
+              attributes.reject { |_, value| value[:index] == false }
+            end
+          end
+
+          def create_index
+            Log.record_connection.create_index(
+              project_name,
+              logstore_name,
+              field_indices
+            )
+          end
+
+          def update_index
+            conf_res = Log.record_connection.get_index(project_name, logstore_name)
+            raw_conf = JSON.parse(conf_res)
+            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'].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
+          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
+            end
+          end
+        end
+
+        def save_array
+          run_callbacks(:create) do
+            run_callbacks(:save) do
+              validate! && dump_attributes
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+module Aliyun
+  module Log
+    module Record
+      class Relation
+        def initialize(klass, opts = {})
+          @klass = klass
+          @opts = opts
+          @klass.auto_load_schema
+        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)
+          ts = from.is_a?(Integer) ? from : from.to_time.to_i
+          @opts[:from] = ts
+          self
+        end
+
+        def to(to)
+          ts = to.is_a?(Integer) ? to : to.to_time.to_i
+          @opts[:to] = ts
+          self
+        end
+
+        def line(val)
+          @opts[:line] = val.to_i
+          self
+        end
+        alias limit line
+
+        def offset(val)
+          @opts[:offset] = val.to_i
+          self
+        end
+
+        def page(val)
+          @opts[:page] = val - 1 if val >= 1
+          self
+        end
+
+        def where(opts)
+          @opts.merge!(opts)
+          self
+        end
+
+        def search(*statement)
+          ql = statement_ql(*statement)
+          @opts[:search] = ql if ql.present?
+          self
+        end
+
+        def sql(*statement)
+          ql = statement_ql(*statement)
+          @opts[:sql] = ql if ql.present?
+          self
+        end
+
+        def query(opts = {})
+          @opts[:query] = opts
+          self
+        end
+
+        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?
+          end
+          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
+          res = JSON.parse(res.body)
+          res[0]['count'].to_i
+        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)
+        end
+
+        def load
+          result.map do |json_attr|
+            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|
+            unless @klass.attributes[:"#{key}"]
+              raise UnknownAttributeError, "unknown field '#{key}' for #{@klass.name}."
+            end
+
+            "#{key}: #{value}"
+          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?
+            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)
+              "'#{bind_vars[match]}'"
+            else
+              raise ParseStatementInvalid, "missing value for :#{match} in #{statement}"
+            end
+          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
+            "'#{bound.shift}'"
+          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
+    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_datetime.iso8601
+            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

@@ -53,24 +53,21 @@ module Aliyun
 
       def do_request(verb, resources, payload)
         resource_path = get_resource_path(resources)
-        headers = {}
-        if verb == 'GET'
-          headers = compact_headers
-          headers['Authorization'] = signature(verb, resource_path, headers, payload)
-        else
-          headers = compact_headers(payload, resources[:is_pb])
-          headers['Authorization'] = signature(verb, resource_path, headers)
-        end
         request_options = {
           method: verb,
           url: get_request_url(resources),
-          headers: headers,
           open_timeout: @config.open_timeout,
           read_timeout: @config.read_timeout
         }
         if verb == 'GET'
-          request_options[:url] = canonicalized_resource(request_options[:url], payload)
+          headers = compact_headers
+          headers['Authorization'] = signature(verb, resource_path, headers, payload)
+          request_options[:headers] = headers
+          request_options[:url] = URI.escape(canonicalized_resource(request_options[:url], payload))
         else
+          headers = compact_headers(payload, resources[:is_pb])
+          headers['Authorization'] = signature(verb, resource_path, headers)
+          request_options[:headers] = headers
           payload = Zlib::Deflate.deflate(payload.encode) if resources[:is_pb]
           request_options[:payload] = payload
         end
@@ -86,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
@@ -104,7 +101,6 @@ module Aliyun
         if is_pb
           compressed = Zlib::Deflate.deflate(body.encode)
           headers['Content-Length'] = compressed.bytesize.to_s
-          # 日志内容包含的日志必须小于3MB和4096条。
           raise 'content length is larger than 3MB' if headers['Content-Length'].to_i > 3_145_728
 
           headers['Content-MD5'] = Digest::MD5.hexdigest(compressed).upcase

data/lib/aliyun/version.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.8
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,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: []
@@ -103,6 +131,14 @@ files:
 - lib/aliyun/log/project.rb
 - lib/aliyun/log/protobuf.rb
 - lib/aliyun/log/protocol.rb
+- lib/aliyun/log/record.rb
+- lib/aliyun/log/record/exception.rb
+- 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