aliyun_iot 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b77eea144b0719d2d909bf02bf10fb08c3bfa6e6
-  data.tar.gz: 2b0450faec422ce648dbd016d5656cc1167545ef
+SHA256:
+  metadata.gz: e16402e9a3fed201eabae408ecc759c8eb3bd6f9172ff21b78350f4562ebc523
+  data.tar.gz: e678f1ce5ce8b2626f92923e7891b2548f18d6f59bda70e02c406fd07f3a3313
 SHA512:
-  metadata.gz: 2ecde67ef1d5385fa84b19be5d14e6100a00d921ab9bc67959a9dcb84dd5a3744f3b7270eb3f9c34ed7189017b167f33fe3ad5a1d6562e28d1082257fcbef720
-  data.tar.gz: 98f5eccf02d8dc2edc26c8bb657aca565294229b774a8b7ba33c1dcdd2f204112c074165b799648124a8214eeda128e34cc85f62d13c549cf6127031f8b395b5
+  metadata.gz: 1b5d843de5ec4bad7847bcf172dcccfaaee30ba2767cc5f66400a6b87d23101a301132235f939a2add82075973231ad935b9ac25e2fe1ad26b6325de26889d68
+  data.tar.gz: 681a0effe4703068d7647df68ec49d69d21f7585dc01df738491a91cbba91a5dd801a88b28ba12e65958b13071bddb8285cd5a4316543f44c8f1e028c1b2749e

data/.gitignore

@@ -10,3 +10,5 @@
 # rspec failure tracking
 .rspec_status
 .gem
+.idea
+.idea/.rakeTasks

data/README.md

@@ -3,7 +3,7 @@ AliyunIot
 
 AliyunIot gem 可以帮助开发者方便地在Rails环境中使用[阿里云物联网套件](https://help.aliyun.com/product/30520.html)提供的服务，包括
 
-- [服务器端API](https://help.aliyun.com/document_detail/30557.html)
+- [服务器端API](https://help.aliyun.com/document_detail/69893.html)
 - [消息服务](https://help.aliyun.com/product/27412.html)
 
 ## 安装
@@ -83,13 +83,13 @@ production:
 
 ```ruby
   AliyunIot::Product.create(Name)                                        ## 创建产品
-  AliyunIot::Product.batch_get_device_state({DeviceName.1, DeviceName.2 ....})   ## 批量查询设备状态
-  AliyunIot::Product.check_regist_state(ApplyId)                         ## 查询注册状态
-  AliyunIot::Product.list_regist_info(ApplyId, PageSize, CurrentPage)    ## 批量查询注册状态
   AliyunIot::Product[ProductKey].update({ProductName, ProductDesc})      ## 修改产品信息
   AliyunIot::Product[ProductKey].list({PageSize, CurrentPage})           ## 查询产品的设备列表
   AliyunIot::Product[ProductKey].regist_device({DeviceName})             ## 设备注册
-  AliyunIot::Product[ProductKey].regist_devices({DeviceName.1, DeviceName.2 ....})    ## 批量注册设备
+  AliyunIot::Product[ProductKey].batch_check_device_names({DeviceName.1: 'ppp', DeviceName.2: 'abc'})    ## 批量注册的设备的名称
+  AliyunIot::Product[ProductKey].query_batch_register_status(apply_id) #查看名称设置结果
+  AliyunIot::Product[ProductKey].batch_register_device_with_apply_id(apply_id) #批量注册设备
+  AliyunIot::Product.query_page_by_apply_id(ApplyId, PageSize, CurrentPage)    ## 查看批量注册的设备信息
   AliyunIot::Product[ProductKey].pub({TopicFullName, MessageContent})    ## 发布消息到设备
   AliyunIot::Product[ProductKey].rrpc({DeviceName, RequestBase64Byte, Timeout}) ## 发消息给设备并同步返回响应
 ```

data/aliyun_iot.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activesupport', '>= 3.2', '<= 5.2'
-  spec.add_runtime_dependency 'nokogiri', '>=1.6.0'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.10.4'
   spec.add_runtime_dependency "rest-client", '>= 1.8.0'
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/aliyun_iot.rb

@@ -23,6 +23,7 @@ class Hash
   end
 end
 module AliyunIot
+  class ParamsError < StandardError; end
 
   class << self
     def configuration

data/lib/aliyun_iot/product.rb

@@ -23,6 +23,11 @@ module AliyunIot
       end
 
       def list_regist_info(apply_id, page_size, current_page)
+        warn "WARNING: Product.list_regist_info is deprecated. Please, use Product.query_page_by_apply_id instead"
+        query_page_by_apply_id(apply_id, page_size, current_page)
+      end
+
+      def query_page_by_apply_id(apply_id, page_size, current_page)
         params = { ApplyId: apply_id, PageSize: page_size, CurrentPage: current_page }
         execute params, 'QueryPageByApplyId'
       end
@@ -45,11 +50,28 @@ module AliyunIot
     end
 
     def regist_device(params = {})
-      execute params, 'RegistDevice'
+      execute params, 'RegisterDevice'
+    end
+
+    def query_device_detail_by_name(device_name)
+      execute({DeviceName: device_name}, 'QueryDeviceDetail')
     end
 
     def regist_devices(params = {})
-      execute params, 'ApplyDeviceWithNames'
+      warn "WARNING: Product#regist_devices is deprecated. Please, use Product#batch_check_device_names instead"
+      batch_check_device_names params
+    end
+
+    def batch_check_device_names(params = {})
+      execute params, 'BatchCheckDeviceNames'
+    end
+
+    def batch_register_device_with_apply_id(apply_id)
+      execute({ApplyId: apply_id}, 'BatchRegisterDeviceWithApplyId')
+    end
+
+    def query_batch_register_status(apply_id)
+      execute({ApplyId: apply_id}, 'QueryBatchRegisterDeviceStatus')
     end
     
     def batch_get_device_state(params = {})
@@ -57,7 +79,7 @@ module AliyunIot
     end
 
     def pub(params = {})
-      raise RequestException.new(Exception.new("message MessageContent is empty!")) if params[:MessageContent].nil?
+      raise ParamsError, "message MessageContent is empty!" if params[:MessageContent].nil?
       params[:MessageContent] = Base64.encode64(params[:MessageContent]).chomp
       execute params, 'Pub'
     end

data/lib/aliyun_iot/queue.rb

@@ -82,6 +82,20 @@ module AliyunIot
       end
     end
 
+    #批量消费消息
+    def batch_receive_message(num = 16, wait_seconds = 3)
+      result = Request::Xml.get(messages_path, query: {waitseconds: wait_seconds, numOfMessages: num})
+      return nil if result.nil?
+      Result.new(self, result, "Messages", "Message").get_message
+    end
+
+    #设置队列属性
+    def set_attr(opts = {})
+      Request::Xml.put(queue_path, query: {Metaoverride: true}) do |request|
+        request.content(:Queue, opts)
+      end
+    end
+
     def queue_path
       "/queues/#{name}"
     end

data/lib/aliyun_iot/request/json.rb

@@ -28,7 +28,7 @@ module AliyunIot
         ts = Time.now.utc.strftime('%FT%TZ')
         base_params = {
             Format: 'JSON',
-            Version: '2017-04-20',
+            Version: '2018-01-20',
             AccessKeyId: access_key_id,
             SignatureMethod: 'HMAC-SHA1',
             Timestamp: ts,

data/lib/aliyun_iot/topic.rb

@@ -58,7 +58,7 @@ module AliyunIot
     #订阅topic
     def subscribe(opts = {})
       if opts[:Endpoint].nil? || opts[:Endpoint].blank?
-        raise Request::XmlException.new(Exception.new("subscribe parameters invalid"))
+        raise ParamsError, "subscribe parameters invalid"
       else
         Request::Xml.put(subscribe_path) do |request|
           request.content(:Subscription, opts)
@@ -74,7 +74,7 @@ module AliyunIot
     #发布消息
     def publish_message(opts = {})
       if opts[:MessageBody].nil? || opts[:MessageBody].blank?
-        raise Exception.new("publish message parameters invalid")
+        raise ParamsError, "publish message parameters invalid"
       else
         Request::Xml.post(message_path) do |request|
           request.content(:Message, opts)

data/lib/aliyun_iot/version.rb

@@ -1,3 +1,3 @@
 module AliyunIot
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun_iot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - CooCOccO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: 阿里云物联网套件ruby sdk