aliyun-log 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed78b39497d6a671405b2d815292ca1e1e11ee301d816395264add76a9bc1235
-  data.tar.gz: 1b2f92c27745b27be61ca5f8fbb41470eaffcd710b22979671604173646c5450
+  metadata.gz: b389451492d70d3427b9a940de87c2166d862ac543f882b97a3924e31b51e92c
+  data.tar.gz: 6f8d17bad66ed46c0a8da7e514c10cfaa1198418e48e7d2f03be8f8de499d16d
 SHA512:
-  metadata.gz: 19e6a18d2c168882054e14875da1baa18bab32217b2626a33e209e25c867b011deb5cba7d0b6de2f4af40a67ff4c66fb12ff3908881d9e28ced5ca8020c152b4
-  data.tar.gz: 7cfdddb1c6d804b4f62ee34cac200d4eb869ff32c70cf5bda5a4fd10947d06c5df61ba273662aff908a57e685a8ce2c586d1e3efed8d71e1dc2c8a59b649e117
+  metadata.gz: 1c68ba2d18b987e36c96187a7007ede440af4f0beb36748e49ce213872f57dd5db78dfb82ed63c4f9ee5f87b558daa4fc0686b13e71533ba4d3dc6fdaa3333ae
+  data.tar.gz: 3ce13d9720545a7394a0b64b2b6adb78f196dd83a554f7b872a57460e29dac5dd2876a5a528c7c728c537ece778bc4913900b0487856dd65c7d563ff5f0045ee

data/lib/aliyun/log/config.rb

@@ -7,7 +7,8 @@ module Aliyun
       @endpoint = 'https://cn-beijing.log.aliyuncs.com'
       @open_timeout = 10
       @read_timeout = 120
-      @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/record.rb

@@ -9,8 +9,7 @@ require 'forwardable'
 require_relative 'record/exception'
 require_relative 'record/field'
 require_relative 'record/persistence'
-require_relative 'record/relation'
-require_relative 'record/scope_registry'
+require_relative 'record/scoping'
 
 module Aliyun
   module Log
@@ -28,7 +27,7 @@ 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
 
@@ -37,6 +36,7 @@ module Aliyun
 
       include Field
       include Persistence
+      include Scoping
 
       include ActiveModel::AttributeMethods
 
@@ -52,40 +52,6 @@ module Aliyun
           opt[:field_doc_value] = opt[:field_doc_value] != false
           self.options = opt
         end
-
-        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 all
-          scope = current_scope
-          scope ||= relation.from(0).to(Time.now.to_i)
-          scope
-        end
-
-        private
-
-        def relation
-          Relation.new(self)
-        end
       end
 
       def initialize(attrs = {})

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,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'type_casting'
+
 module Aliyun
   module Log
     module Record
@@ -18,10 +20,12 @@ 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
@@ -33,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) }
@@ -61,7 +65,6 @@ module Aliyun
               remove_method field
               remove_method :"#{field}="
               remove_method :"#{field}?"
-              remove_method :"#{field}_before_type_cast"
             end
           end
 
@@ -77,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
@@ -103,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
@@ -114,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

@@ -56,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
@@ -80,17 +79,11 @@ module Aliyun
           end
 
           def field_indices
-            indices = if options[:field_index] == false
-                        attributes.select { |_, value| value[:index] == true }
-                      else
-                        attributes.reject { |_, value| value[:index] == false }
-                      end
-            indices.each do |_, v|
-              next unless v[:doc_value].nil?
-
-              v[:doc_value] = options[:field_doc_value] != false
+            if options[:field_index] == false
+              attributes.select { |_, value| value[:index] == true }
+            else
+              attributes.reject { |_, value| value[:index] == false }
             end
-            indices
           end
 
           def create_index
@@ -104,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
@@ -123,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
@@ -135,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,12 +8,11 @@ module Aliyun
           @klass = klass
           @opts = opts
           @klass.auto_load_schema
-          @opts[:search] ||= '*'
         end
 
-        def inspect
-          "#<#{self.class}>"
-        end
+        # def inspect
+        #   "#<#{self.class}>"
+        # end
 
         def first(line = 1)
           find_offset(0, line, false)
@@ -87,13 +86,15 @@ 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)
+          ql = statement_ql(*statement)
+          @opts[:sql] = ql if ql.present?
           self
         end
 
@@ -120,7 +121,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)
@@ -128,16 +129,72 @@ 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
-            @klass.new(attrs)
+            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) }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -137,6 +137,8 @@ files:
 - 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