aliyun_iot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a8e2c6dc0cf992364f0fc18e4fa8e1bd360274
-  data.tar.gz: e9077f32da1e594c3b0ce6e2d4b6fee3044475d5
+  metadata.gz: b77eea144b0719d2d909bf02bf10fb08c3bfa6e6
+  data.tar.gz: 2b0450faec422ce648dbd016d5656cc1167545ef
 SHA512:
-  metadata.gz: 828d01bb13580c10f440305645fe7b6b096e70b8167ede7a44e285495469c0df746ca5775556fc95a64568f28a39a2f5369ebaed5fda41841400b685d4d242f5
-  data.tar.gz: 1d0e8da9fd33151f010c82ead720961c4caba66a5117723613fd0397dcf975dfbc1ecc5c8815a63bc02455b99ab561f407ce93a00052d1a340df19c368a086ec
+  metadata.gz: 2ecde67ef1d5385fa84b19be5d14e6100a00d921ab9bc67959a9dcb84dd5a3744f3b7270eb3f9c34ed7189017b167f33fe3ad5a1d6562e28d1082257fcbef720
+  data.tar.gz: 98f5eccf02d8dc2edc26c8bb657aca565294229b774a8b7ba33c1dcdd2f204112c074165b799648124a8214eeda128e34cc85f62d13c549cf6127031f8b395b5

data/README.md

@@ -60,6 +60,7 @@ production:
 ```ruby
   AliyunIot::Queue.queues                                                ## 列出所有队列
   AliyunIot::Queue[QueueName].receive_message(WaitSeconds)               ## 消费消息
+  AliyunIot::Queue[QueueName].batch_receive_message(MessageCount, WaitSeconds)  ## 批量消费消息
   AliyunIot::Queue[QueueName].peek                                       ## 查看消息
   AliyunIot::Queue[QueueName].create({DelaySeconds, MaximumMessageSize, MessageRetentionPeriod, VisibilityTimeout, PollingWaitSeconds, LoggingEnabled})                                   ## 创建队列
   AliyunIot::Queue[QueueName].delete                                     ## 删除队列
@@ -82,7 +83,8 @@ production:
 
 ```ruby
   AliyunIot::Product.create(Name)                                        ## 创建产品
-  AliyunIot::Product.check_regist_state(ApplyId)                         ## 批量查询注册状态
+  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})           ## 查询产品的设备列表

data/lib/aliyun_iot.rb

@@ -9,6 +9,7 @@ require "aliyun_iot/queue"
 require "aliyun_iot/topic"
 require "aliyun_iot/message"
 require "aliyun_iot/product"
+require "aliyun_iot/result"
 
 class Hash
   def self.xml_array content, *path

data/lib/aliyun_iot/message.rb

@@ -1,20 +1,12 @@
 require "aliyun_iot/request/xml"
 module AliyunIot
   class Message
-    attr_reader :queue, :id, :body_md5, :body, :receipt_handle, :enqueue_at, :first_enqueue_at, :next_visible_at, :dequeue_count, :priority
+    attr_reader :h, :queue, :id, :body_md5, :body, :receipt_handle, :enqueue_at, :first_enqueue_at, :next_visible_at, :dequeue_count, :priority
 
-    def initialize(queue, content)
-      h = Hash.xml_object(content, "Message")
+    def initialize(queue, h)
+      @h = h
       @queue = queue
-      @id = h["MessageId"]
-      @body_md5 = h["MessageBodyMD5"]
-      @body = h["MessageBody"]
-      @enqueue_at = Time.at(h["EnqueueTime"].to_i/1000.0)
-      @first_enqueue_at = Time.at(h["FirstDequeueTime"].to_i/1000.0)
-      @dequeue_count = h["DequeueCount"].to_i
-      @priority = h["Priority"].to_i
-      @receipt_handle = h["ReceiptHandle"]
-      @next_visible_at = Time.at(h["NextVisibleTime"].to_i/1000.0)
+      set_message_info
     end
 
     #删除消息
@@ -56,6 +48,18 @@ module AliyunIot
     end
 
     private
+    
+    def set_message_info
+      @id = h["MessageId"]
+      @body_md5 = h["MessageBodyMD5"]
+      @body = h["MessageBody"]
+      @enqueue_at = Time.at(h["EnqueueTime"].to_i/1000.0)
+      @first_enqueue_at = Time.at(h["FirstDequeueTime"].to_i/1000.0)
+      @dequeue_count = h["DequeueCount"].to_i
+      @priority = h["Priority"].to_i
+      @receipt_handle = h["ReceiptHandle"]
+      @next_visible_at = Time.at(h["NextVisibleTime"].to_i/1000.0)      
+    end
 
     def set_data(query)
       {mqs_headers: {"x-mns-version" => "2015-06-06"}, query: query}

data/lib/aliyun_iot/product.rb

@@ -51,13 +51,15 @@ module AliyunIot
     def regist_devices(params = {})
       execute params, 'ApplyDeviceWithNames'
     end
+    
+    def batch_get_device_state(params = {})
+      execute params, 'BatchGetDeviceState'
+    end
 
     def pub(params = {})
       raise RequestException.new(Exception.new("message MessageContent is empty!")) if params[:MessageContent].nil?
-      default_params = { Qos: '0' }
-      default_params.merge!({ Qos: '0' }) if params[:Qos].nil?
-      params[:MessageContent] = Base64.urlsafe_encode64(params[:MessageContent]).chomp
-      execute params.merge(default_params), 'Pub'
+      params[:MessageContent] = Base64.encode64(params[:MessageContent]).chomp
+      execute params, 'Pub'
     end
 
     def sub(params = {})

data/lib/aliyun_iot/queue.rb

@@ -16,7 +16,7 @@ module AliyunIot
       def queues(opts = {})
         mqs_options = {query: "x-mns-prefix", offset: "x-mns-marker", size: "x-mns-ret-number"}
         mqs_headers = opts.slice(*mqs_options.keys).reduce({}) { |mqs_headers, item| k, v = *item; mqs_headers.merge!(mqs_options[k] => v) }
-        response = Request::Xml.get("/queues", mqs_headers: mqs_headers.merge({"x-mns-version" => "2015-06-06"}))
+        response = Request::Xml.get("/queues", mqs_headers)
         Hash.xml_array(response, "Queues", "Queue").collect { |item| Queue.new(URI(item["QueueURL"]).path.sub!(/^\/queues\//, "")) }
       end
     end
@@ -28,7 +28,7 @@ module AliyunIot
 
     #创建队列
     def create(opts = {})
-      Request::Xml.put(queue_path, mqs_headers: {"x-mns-version" => "2015-06-06"}) do |request|
+      Request::Xml.put(queue_path) do |request|
         msg_options = {
             :VisibilityTimeout => 30,
             :DelaySeconds => 0,
@@ -36,39 +36,50 @@ module AliyunIot
             :MessageRetentionPeriod => 345600,
             :PollingWaitSeconds => 0
         }.merge(opts)
-        request.content_xml(:Queue, msg_options)
+        request.content(:Queue, msg_options)
       end
     end
 
     #查看消息
     def peek
-      request_opts = {mqs_headers: {"x-mns-version" => "2015-06-06"}, query: {peekonly: true}}
-      Request::Xml.get(messages_path, request_opts)
+      Request::Xml.get(messages_path, query: {peekonly: true})
     end
 
     #删除队列
     def delete
-      Request::Xml.delete(queue_path, mqs_headers: {"x-mns-version" => "2015-06-06"})
+      Request::Xml.delete queue_path
     end
 
     #发送消息
     def send_message(message, opts = {})
-      Request::Xml.post(messages_path, mqs_headers: {"x-mns-version" => "2015-06-06"}) do |request|
+      Request::Xml.post(messages_path) do |request|
         msg_options = {
             :DelaySeconds => 0,
             :Priority => 8
         }.merge(opts)
-        request.content_xml(:Message, msg_options.merge(:MessageBody => message.to_s))
+        request.content(:Message, msg_options.merge(:MessageBody => message.to_s))
       end
     end
 
     #消费消息
-    def receive_message(wait_seconds = nil)
-      request_opts = {mqs_headers: {"x-mns-version" => "2015-06-06"}}
-      request_opts.merge!(query: {waitseconds: wait_seconds}) if wait_seconds
-      result = Request::Xml.get(messages_path, request_opts)
+    def receive_message(wait_seconds = 3)
+      result = Request::Xml.get(messages_path, query: {waitseconds: wait_seconds})
       return nil if result.nil?
-      Message.new(self, result)
+      Result.new(self, result).get_message
+    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

data/lib/aliyun_iot/result.rb

@@ -0,0 +1,16 @@
+module AliyunIot
+  class Result
+    
+    attr_reader :h, :queue
+    
+    def initialize(queue, content, *path)
+      @queue = queue
+      @h = path.blank? ? Hash.xml_object(content, "Message") : Hash.xml_array(content, *path)
+    end
+    
+    def get_message
+      h.is_a?(Array) ? h.map{ |message| Message.new(queue, message) } : Message.new(queue, h)
+    end
+
+  end
+end

data/lib/aliyun_iot/topic.rb

@@ -15,7 +15,7 @@ module AliyunIot
       def topics(opts = {})
         mqs_options = {query: "x-mns-prefix", offset: "x-mns-marker", size: "x-mns-ret-number"}
         mqs_headers = opts.slice(*mqs_options.keys).reduce({}) { |mqs_headers, item| k, v = *item; mqs_headers.merge!(mqs_options[k] => v) }
-        response = Request::Xml.get("/topics", mqs_headers: mqs_headers.merge({"x-mns-version" => "2015-06-06"}))
+        response = Request::Xml.get("/topics", mqs_headers: mqs_headers)
         Hash.xml_array(response, "Topics", "Topic").collect { |item| Topic.new(URI(item["TopicURL"]).path.sub!(/^\/topics\//, "")) }
       end
     end
@@ -27,7 +27,7 @@ module AliyunIot
 
     #创建topic
     def create(opts={})
-      Request::Xml.put(topic_path, mqs_headers: {"x-mns-version" => "2015-06-06"}) do |request|
+      Request::Xml.put(topic_path) do |request|
         msg_options = {
             MaximumMessageSize: 65536
         }.merge(opts)
@@ -37,12 +37,12 @@ module AliyunIot
 
     # 删除topic
     def delete
-      Request::Xml.delete(topic_path, mqs_headers: {"x-mns-version" => "2015-06-06"})
+      Request::Xml.delete(topic_path)
     end
 
     # 获取topic属性
     def get_topic_attributes
-      topic_hash = Hash.from_xml(Request::Xml.get(topic_path, mqs_headers: {"x-mns-version" => "2015-06-06"}))
+      topic_hash = Hash.from_xml(Request::Xml.get(topic_path))
       {
           topic_name: topic_hash["Topic"]["TopicName"],
           create_time: topic_hash["Topic"]["CreateTime"],
@@ -60,7 +60,7 @@ module AliyunIot
       if opts[:Endpoint].nil? || opts[:Endpoint].blank?
         raise Request::XmlException.new(Exception.new("subscribe parameters invalid"))
       else
-        Request::Xml.put(subscribe_path, mqs_headers: {"x-mns-version" => "2015-06-06"}) do |request|
+        Request::Xml.put(subscribe_path) do |request|
           request.content(:Subscription, opts)
         end
       end
@@ -68,7 +68,7 @@ module AliyunIot
 
     #退订topic
     def unsubscribe
-      Request::Xml.delete(subscribe_path, mqs_headers: {"x-mns-version" => "2015-06-06"})
+      Request::Xml.delete(subscribe_path)
     end
 
     #发布消息
@@ -76,7 +76,7 @@ module AliyunIot
       if opts[:MessageBody].nil? || opts[:MessageBody].blank?
         raise Exception.new("publish message parameters invalid")
       else
-        Request::Xml.post(message_path, mqs_headers: {"x-mns-version" => "2015-06-06"}) do |request|
+        Request::Xml.post(message_path) do |request|
           request.content(:Message, opts)
         end
       end

data/lib/aliyun_iot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun_iot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - CooCOccO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/aliyun_iot/request/http_client.rb
 - lib/aliyun_iot/request/json.rb
 - lib/aliyun_iot/request/xml.rb
+- lib/aliyun_iot/result.rb
 - lib/aliyun_iot/topic.rb
 - lib/aliyun_iot/version.rb
 - lib/generators/aliyun_iot/install_generator.rb