tablestore-ruby-sdk 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c36ab88b0d68c1d3d9b195807ad3f20b8350e846
-  data.tar.gz: '0928fd79588d6dbcca9d7af69ff4aa188f5ebbb0'
+  metadata.gz: 86177da99a4888d0a61d1b52b20f90b43fb3624d
+  data.tar.gz: 37ad84d31c752483becbd23dcebc212ce054607c
 SHA512:
-  metadata.gz: 65470041a252ccfc3812746fa787904cfa351346bbdc0989f7712e9f1b2c8a76cce11b8a2378e5da86de69bd51d9252c8385a18fe6429ee13ce650583ef6cea2
-  data.tar.gz: d805aa949b1a73d505db768b3076ca0f21d7adc75a1aa1a71a0177a9d0435662b29a28d55030301594c42dd0bd278c1a1ca47615d4951878818c5e1b0458562a
+  metadata.gz: ffcd6971f6c6b5e7311e5495bec618db4f2eef6797f7e8dd701e594252ee60f6ac05e3a3ab047e36f86862c348c6d463f777b2c1d60543a9ad6c1a49726810f1
+  data.tar.gz: 6aadd6fb901ddab23eab2dbe74bcd78e283f7cf7f16f1f3b05f3627c9a39c3a395ed7e261ef28ad51866c5ff862b15a55ddfe44ea8c3c6b3aa525c7c3c404051

data/lib/tablestore-ruby-sdk.rb

@@ -11,8 +11,9 @@ class TableStore
   DEFAULT_MAX_CONNECTION = 50
   DEFAULT_LOGGER_NAME = 'tablestore-client'
 
+  attr_accessor :base_url, :access_key_id, :access_key_secret, :instance_name
 
-  def initialize(end_point, access_key_id, access_key_secret, instance_name, **kwargs)
+  def initialize(base_url, access_key_id, access_key_secret, instance_name, **kwargs)
     # 初始化TableStoreClient实例。
     # end_point是TableStoreClient服务的地址（例如 'http://instance.cn-hangzhou.TableStoreClient.aliyun.com'），必须以'http://'或'https://'开头。
     # access_key_id是访问TableStoreClient服务的accessid，通过官方网站申请或通过管理员获取。
@@ -28,6 +29,11 @@ class TableStore
     #self.validate_parameter(end_point, access_key_id, access_key_secret, instance_name)
     #sts_token = kwargs.get('sts_token')
 
+    self.base_url            = base_url
+    self.access_key_id       = access_key_id
+    self.access_key_secret   = access_key_secret
+    self.instance_name       = instance_name
+
     #示例：创建一个TableStoreClient实例
     # from tablestore.client import TableStoreClient
     # client = TableStoreClient('your_instance_endpoint', 'your_user_id', 'your_user_key', 'your_instance_name')
@@ -56,6 +62,15 @@ class TableStore
     TableStoreClient.new.decode_get_row(response.body)
   end
 
+  def _update_row(table_name, row, condition)
+    api_name = 'UpdateRow'
+    body = TableStoreClient.new.encode_update_row(table_name, row, condition)
+    response = post_request(body, api_name)
+    if response.code == 200
+      'update succeed!'
+    end
+  end
+
   def _batch_get_row(request)
     api_name = 'BatchGetRow'
     body = TableStoreClient.new.make_batch_get_row(request)
@@ -76,22 +91,26 @@ class TableStore
   def post_request(body, api_name)
     md5 = Base64.encode64(Digest::MD5.new.digest(body)).gsub(/\n/, '')
     headers = get_headers(md5, api_name)
-    url = BaseUrl+ '/' + api_name
-    RestClient.post(url, body, headers)
+    url = base_url + '/' + api_name
+    begin
+      RestClient.post(url, body, headers)
+    rescue => e
+      raise '请检查传入参数'
+    end
   end
 
   def get_headers(md5, api_name)
     headers = {
-        "x-ots-date": '2018-01-09T14:48:12.000Z',#Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%S.000Z'),
+        "x-ots-date": Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%S.000Z'),
         "x-ots-apiversion": '2015-12-31',
-        "x-ots-accesskeyid": UserID,
+        "x-ots-accesskeyid": access_key_id,
         "x-ots-contentmd5": md5,
-        "x-ots-instancename": InstanceName,
+        "x-ots-instancename": instance_name,
     }
     signature_string = "/#{api_name}\nPOST\n\n"
     headers_string = headers.map{|k,v| "#{k.downcase}:#{v.strip}"}.sort.join("\n")
     signature_string += headers_string + "\n"
-    salt1 = OpenSSL::HMAC.digest('sha1', UserSecret, signature_string)
+    salt1 = OpenSSL::HMAC.digest('sha1', access_key_secret, signature_string)
     signature = Base64.encode64(salt1).gsub(/\n/, '')
     headers.merge!({'User-Agent': 'aliyun-tablestore-sdk-ruby', 'x-ots-signature': signature})
     headers

data/lib/tablestore/plain_buffer_coded_input_stream.rb

@@ -209,7 +209,7 @@ class PlainBufferCodedInputStream
     row_list = []
     while !@input_stream.is_at_end?
       pk, attr = read_row_without_header
-      row_list << {pk:pk, attr: attr}
+      row_list << {"primary_key"=>pk, "attribute_columns"=> attr}
     end
     row_list
   end

data/lib/tablestore/table_store_client.rb

@@ -47,7 +47,7 @@ class TableStoreClient
   def encode_put_row(table_name, row, condition)
     proto = PutRowRequest.new
     proto.table_name = table_name
-    condition = Condition(RowExistenceExpectation::IGNORE, nil) if condition.nil?
+    condition = Condition.new(RowExistenceExpectation::IGNORE) if condition.nil?
     contion_proto = Condition.new
     proto.condition = make_condition(contion_proto, condition)
     proto.row = serialize_for_put_row(row.primary_key, row.attribute_columns)
@@ -66,6 +66,18 @@ class TableStoreClient
     proto.serialize_to_string
   end
 
+  def encode_update_row(teble_name, row, condition)
+    proto = UpdateRowRequest.new
+    proto.table_name = table_name
+    condition = Condition.new(RowExistenceExpectation::IGNORE) if condition.nil?
+    proto.condition = condition
+    if return_type == ReturnType::RT_PK
+        proto.return_content.return_type = RT_PK
+    end
+    proto.row_change = serialize_for_update_row(row.primary_key, row.attribute_columns)
+    proto
+  end
+
   def decode_get_row(body)
     proto = GetRowResponse.new
     proto.parse_from_string(body)
@@ -359,9 +371,9 @@ class TableStoreClient
         raise TableStoreClientError.new("the columns value of update-row must be hash, but is #{attribute_columns[key].class}")
       end
       attribute_columns[key].each do |cell|
-        # if  cell.is_a?(Array)
-        #   raise TableStoreClientError.new("the cell of update-row must be array, but is #{cell.class}")
-        # end
+        if cell.is_a?(Array)
+          raise TableStoreClientError.new("the cell of update-row must be array, but is #{cell.class}")
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablestore-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - seveninches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,19 +25,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: protobuf
+  name: ruby_protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +51,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +65,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: