aliyun_sls_sdk 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06026a99ab9e00ffead4a3f9a327cdc81fb42cfb
-  data.tar.gz: 204c854483de06e96a8a928a8ecb1b3aeb35f2fb
+  metadata.gz: cc07413c32c73b456a587f6e989ba703a730f364
+  data.tar.gz: 31314032b496372b15a7071efcd7163cf868862a
 SHA512:
-  metadata.gz: ffa653d8be8e2d42ac3708842cc4668e7e21d9d1ff4402c43f7b034b3d8433ffbe6227e3ed5bded20c8b3eec54f9574d4e3b0e36ad7088a058e1cd3d60b58b11
-  data.tar.gz: badb32a9c472c5f7880d42fbcbc18ff0eabca0671dec3787abb35006570bd3be8c56e40abbe7688aeec53c4f5b0da3faa4910add2fa4356daac8290efe21574a
+  metadata.gz: a74d8f5aae9cb3bba763b5de1a1ec67719c5e069c197df420f9856e455fcfa426d458ed106d3df28987ef2bfd9e59575656fd7b8fe6c9f73c06c918fe628eb9d
+  data.tar.gz: 878dd8a3b97c27749169afc86e22e23e812dc72585360cdc62eb1f095b462a009fc323f50d79c538e32b7ac7916316f2d8f3620d21b928ecfa9748638d56df6f

data/aliyun_sls_sdk.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_dependency "beefcake", "~> 0"
+  spec.add_dependency "google-protobuf", "~>3.2"
   spec.add_dependency "file-tail", "~> 0"
   spec.add_dependency "ruby-hmac", "~> 0"
   spec.add_dependency "addressable", "~> 0"

data/lib/aliyun_sls_sdk/connection.rb

@@ -24,7 +24,7 @@ module AliyunSlsSdk
         # http://docs.aliyun.com/#/pub/sls/api/apilist&PutLogs
         def puts_logs(logstorename, content)
             # 压缩content数据
-            compressed = Zlib::Deflate.deflate(content.encode.to_s)
+            compressed = Zlib::Deflate.deflate(LogGroup.encode(content))
             headers = compact_headers(content, compressed)
             headers["Authorization"] = signature("POST", logstorename, headers, content, {})
 
@@ -196,7 +196,7 @@ DOC
             headers["x-sls-bodyrawsize"] = "0"
 
             if content and compressed
-                body = content.encode.to_s
+                body = LogGroup.encode(content)
                 headers["Content-Length"] = compressed.bytesize.to_s
                 # 日志内容包含的日志必须小于3MB和4096条。
                 raise AliyunSls::PostBodyTooLarge, "content length is larger than 3MB" if headers["Content-Length"].to_i > 3*1024**2*8

data/lib/aliyun_sls_sdk/sls_message_types_pb.rb

@@ -0,0 +1,31 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: sls_message_types.proto
+
+require 'google/protobuf'
+
+module AliyunSlsSdk
+  Google::Protobuf::DescriptorPool.generated_pool.build do
+    add_message "Log" do
+      optional :time, :uint32, 1
+      repeated :contents, :message, 2, "Log.Content"
+    end
+    add_message "Log.Content" do
+      optional :key, :string, 1
+      optional :value, :string, 2
+    end
+    add_message "LogGroup" do
+      repeated :logs, :message, 1, "Log"
+      optional :reserved, :string, 2
+      optional :topic, :string, 3
+      optional :source, :string, 4
+    end
+    add_message "LogGroupList" do
+      optional :logGroupList, :message, 1, "LogGroup"
+    end
+  end
+
+  Log = Google::Protobuf::DescriptorPool.generated_pool.lookup("Log").msgclass
+  Log::Content = Google::Protobuf::DescriptorPool.generated_pool.lookup("Log.Content").msgclass
+  LogGroup = Google::Protobuf::DescriptorPool.generated_pool.lookup("LogGroup").msgclass
+  LogGroupList = Google::Protobuf::DescriptorPool.generated_pool.lookup("LogGroupList").msgclass
+end

data/lib/aliyun_sls_sdk/version.rb

@@ -1,3 +1,3 @@
 module AliyunSlsSdk
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/aliyun_sls_sdk.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'version.rb')
-require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'protobuf.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'connection.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'sls_message_types_pb.rb')
 
 module AliyunSlsSdk
     class PostBodyInvalid < RuntimeError; end

data/sls_message_types.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+message Log
+{
+    uint32 time = 1; // UNIX Time Format
+    message Content
+    {
+        string key = 1;
+        string value = 2;
+    }
+    repeated Content contents= 2;
+}
+message LogGroup
+{
+    repeated Log logs= 1;
+    string reserved =2; // 内部字段，不需要填写
+    string topic = 3;
+    string source = 4;
+}
+message LogGroupList
+{
+    LogGroup logGroupList = 1;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun_sls_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - linhua.tlh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: beefcake
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: file-tail
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +122,9 @@ files:
 - aliyun_sls_sdk.gemspec
 - lib/aliyun_sls_sdk.rb
 - lib/aliyun_sls_sdk/connection.rb
-- lib/aliyun_sls_sdk/protobuf.rb
+- lib/aliyun_sls_sdk/sls_message_types_pb.rb
 - lib/aliyun_sls_sdk/version.rb
+- sls_message_types.proto
 homepage: https://help.aliyun.com/product/28958.html
 licenses:
 - MIT

data/lib/aliyun_sls_sdk/protobuf.rb

@@ -1,50 +0,0 @@
-require 'beefcake'
-
-module AliyunSlsSdk
-    module Protobuf
-
-# message Log
-# {
-#     required uint32 time = 1; // UNIX Time Format
-#     message Content
-#     {
-#         required string key = 1;
-#         required string value = 2;
-#     }
-#     repeated Content contents= 2;
-# }
-
-# message LogGroup
-# {
-#     repeated Log logs= 1;
-#     optional string reserved =2; // 内部字段，不需要填写
-#     optional string topic = 3;
-#     optional string source = 4;
-# }
-
-        class Log
-            include Beefcake::Message
-
-            required :time, :uint32, 1
-
-            class Content
-                include Beefcake::Message
-
-                required :key, :string, 1
-                required :value, :string, 2
-            end
-
-            repeated :contents, Content, 2
-        end
-
-        class LogGroup
-            include Beefcake::Message
-
-            repeated :logs, Log, 1
-            optional :reserved, :string, 2
-            optional :topic, :string, 3
-            optional :source, :string, 4
-        end
-        
-    end
-end