aliyun-log 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b17c3b8727ec3dc44742d220f22f26014a201334889f888d858a0cbc33b9c39
-  data.tar.gz: df953904cf39fea58a11d99fab15ca115e3187667d062dfacec0a6f1301b2510
+  metadata.gz: ed78b39497d6a671405b2d815292ca1e1e11ee301d816395264add76a9bc1235
+  data.tar.gz: 1b2f92c27745b27be61ca5f8fbb41470eaffcd710b22979671604173646c5450
 SHA512:
-  metadata.gz: dc5e4072953b2e687f7153230d23f3f6c6d68ac80abb52278819531cb6219eec1c0c9abf593e93d2b05dc697d74f6be75d94c522314088c416bb108631290bd7
-  data.tar.gz: 96b65f80b1fba4284d4472e524d8e424d58fff86ebac92cb281481af51134f8a75bb624d8339f67735038d3d36252bb4a6aa66bb3bc117c8706622a80eccefc1
+  metadata.gz: 19e6a18d2c168882054e14875da1baa18bab32217b2626a33e209e25c867b011deb5cba7d0b6de2f4af40a67ff4c66fb12ff3908881d9e28ced5ca8020c152b4
+  data.tar.gz: 7cfdddb1c6d804b4f62ee34cac200d4eb869ff32c70cf5bda5a4fd10947d06c5df61ba273662aff908a57e685a8ce2c586d1e3efed8d71e1dc2c8a59b649e117

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,7 +7,6 @@ module Aliyun
       @endpoint = 'https://cn-beijing.log.aliyuncs.com'
       @open_timeout = 10
       @read_timeout = 120
-      @log_file = 'aliyun_log.log'
       @log_level = Logger::DEBUG
       @timestamps = true
       class << self

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

@@ -10,6 +10,7 @@ require_relative 'record/exception'
 require_relative 'record/field'
 require_relative 'record/persistence'
 require_relative 'record/relation'
+require_relative 'record/scope_registry'
 
 module Aliyun
   module Log
@@ -31,7 +32,7 @@ module Aliyun
 
         define_model_callbacks :save, :create, :initialize
 
-        after_initialize :set_created_at
+        before_save :set_created_at
       end
 
       include Field
@@ -41,27 +42,45 @@ module Aliyun
 
       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
+          self._schema_load = true if opt[:auto_sync] == false
+          opt[:field_doc_value] = opt[:field_doc_value] != false
+          self.options = opt
         end
 
-        Relation.instance_methods(false).each do |method|
-          define_method(method) do |args|
-            relation.public_send(method, args)
-          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
 
-        %i[count load result].each do |method|
-          define_method(method) do
-            relation.public_send(method)
+        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
@@ -101,7 +120,7 @@ module Aliyun
                        end.compact.join(', ')
                      else
                        'not initialized'
-        end
+                     end
 
         "#<#{self.class} #{inspection}>"
       end

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

@@ -1,8 +1,4 @@
 # frozen_string_literal: true
-require "active_support"
-require "active_support/time"
-require "active_support/core_ext"
-require "active_model"
 
 module Aliyun
   module Log
@@ -29,6 +25,7 @@ module Aliyun
             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))
 

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)
@@ -79,11 +80,17 @@ module Aliyun
           end
 
           def field_indices
-            if options[:field_index] == true
-              attributes.reject { |_, value| value[:index] == false }
-            else
-              attributes.select { |_, value| value[:index] == true }
+            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
             end
+            indices
           end
 
           def create_index

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

@@ -11,6 +11,49 @@ module Aliyun
           @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)
           ts = from.is_a?(Integer) ? from : from.to_time.to_i
           @opts[:from] = ts
@@ -92,6 +135,16 @@ module Aliyun
             @klass.new(attrs)
           end
         end
+
+        private
+
+        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

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/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.2'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Yingce Liu
@@ -136,6 +136,7 @@ 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/request.rb
 - lib/aliyun/log/server_error.rb
 - lib/aliyun/version.rb