libmagellan 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b45a69c0c9d2f8b9f43d46982bbc6eaf996c1b
-  data.tar.gz: 4a66787949d38ea6c7b59165525d9caa68d616d1
+  metadata.gz: 3871e63211b7396a0ba438cf859071efd30a810c
+  data.tar.gz: e93b0f9b640106a7b305fad091123e61994c25f8
 SHA512:
-  metadata.gz: 71440d7cfc32a062e72794ef68fd639f65529b7eaa31e3eeff452d10083694e3bedfbcd4754dd20bacc758579bbe343a4161eeda302441fd0a12d7543976cc75
-  data.tar.gz: 81787a14f39dfd840cd5c97be79d8b6d0c80703cf01ab3b73e35ef6d629c273ada6a6d773ce3d93c74b93e3f91c2e7e6c8024d0240e864e97b1db1ea9c0e5c84
+  metadata.gz: 99775a4dc3340ef07c1b0a80584c84719e01e59b5926152e74410a372532b6e75362bc992cc85b59e26af44fef9ff3243eb152c8e295c827460eb339de439a3c
+  data.tar.gz: f146f7fee6374a3d34221344999a555ccd67a4a48c793e902df4279b769c87f590227339ed668509596d6d0512f8feac47edfb83623bb13829be47e4678eae5f

data/lib/libmagellan/core.rb

@@ -78,6 +78,10 @@ module Libmagellan
     end
     alias :sub :subscribe
 
+    def get_packet(topic=nil, &block)
+      @mqtt.get_packet(topic, &block)
+    end
+
     def disconnect
       @mqtt.disconnect
     end
@@ -109,6 +113,18 @@ module Libmagellan
       logger.level = level
     end
 
+    def inspect
+      h = @http
+      m = @mqtt
+      arr = ["\#<#{self.class}: @base_uri=\"#{h.base_uri.to_s}\"",
+             "@consumer_key=\"#{h.consumer_key}\"",
+             "@client_version=\"#{h.client_version}\"",]
+      arr += ["@mqtt_host=\"#{m.host}\"",
+              "@mqtt_port=#{m.port}"] if @mqtt
+      arr << ">"
+      arr.join(", ")
+    end
+
   end
 
 end

data/lib/libmagellan/http.rb

@@ -8,6 +8,9 @@ require 'active_support/core_ext/object/blank'
 module Libmagellan
   class HTTP
 
+    attr_accessor :base_uri, :project, :consumer_key, :client_version
+    attr_accessor :verbose
+
     DEFAULT_OPTIONS = {
       # consumer_key: "groovenauts-test",
       # consumer_secret: "test",
@@ -26,6 +29,7 @@ module Libmagellan
       @consumer_key    = options.delete :consumer_key || @project
       @consumer_secret = options.delete :consumer_secret
       @client_version  = options.delete :client_version
+      @verbose         = options.delete :verbose
       @skip_verify     = options[:skip_verify] || false
       arg = args.first
       @base_uri =
@@ -51,6 +55,14 @@ module Libmagellan
         path_query = "#{uri.path}"
         path_query << "?#{uri.query}" unless uri.query.blank?
 
+        if verbose
+          verbose_body =
+            case method.downcase.to_sym
+            when :patch, :put, :post then "\nBody:\n#{body}"
+            else nil
+            end
+          $stderr.puts("\e[34m#{uri.to_s}\nHeaders:\n#{headers.inspect}#{verbose_body}\e[0m")
+        end
         response = case method.downcase.to_sym
                    when :patch  then http.patch(path_query, body, headers)
                    when :delete then http.delete(path_query, headers)

data/lib/libmagellan/mqtt.rb

@@ -75,10 +75,10 @@ module Libmagellan
     # Publish message to MQTT server.
     # @param [String] topic Topic name
     # @param [String] payload Payload
-    def publish(topic, payload)
+    def publish(topic, payload, retain=false, qos=0)
       payload = payload.to_json unless payload.is_a?(::String)
       with_connection do |c|
-        c.publish(topic, payload)
+        c.publish(topic, payload, retain, qos)
         log("[PUBLISH] #{topic}: #{payload}", Logger::DEBUG)
       end
     end
@@ -105,8 +105,8 @@ module Libmagellan
     def get(topic=nil)
       with_connection do |c|
         if block_given?
-          c.get(topic) do |topic_, message_|
-            yield(topic_, message_)
+          c.get(topic) do |topic_, payload_|
+            yield(topic_, payload_)
           end
         else
           # return topic, payload
@@ -115,6 +115,22 @@ module Libmagellan
       end
     end
 
+    # Get message to me
+    # @param [String] topic Topic name
+    # @return [Mqtt::Packet] MQTT packet object
+    def get_packet(topic=nil)
+      with_connection do |c|
+        if block_given?
+          c.get_packet(topic) do |packet|
+            yield(packet)
+          end
+        else
+          # return topic, payload
+          c.get_packet(topic)
+        end
+      end
+    end
+
 
     # MQTT Disconnect
     def disconnect

data/lib/libmagellan/version.rb

@@ -1,3 +1,3 @@
 module Libmagellan
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/libmagellan/http_spec.rb

@@ -16,6 +16,15 @@ describe Libmagellan::HTTP do
 
     describe :get do
       it :success do
+        allow(http).to receive(:get).\
+          with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
+          and_return(res)
+        r = lm.request("/ping")
+        expect(r).to eq res
+      end
+
+      it "success with client_version" do
+        lm.client_version = "0.0.1"
         allow(http).to receive(:get).\
           with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
           and_return(res)
@@ -27,14 +36,14 @@ describe Libmagellan::HTTP do
     describe :post do
       it :success do
         allow(http).to receive(:post).\
-          with("/ping", "param1=value1", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+          with("/ping", "param1=value1", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
           and_return(res)
         r = lm.request("/ping", :post, "param1=value1")
         expect(r).to eq res
       end
       it "accept Hash as body parameter" do
         allow(http).to receive(:post).\
-          with("/ping", "param1=value1&param2=value2", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+          with("/ping", "param1=value1&param2=value2", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
           and_return(res)
         r = lm.request("/ping", :post, {param1: "value1", param2: "value2"})
         expect(r).to eq res
@@ -44,7 +53,7 @@ describe Libmagellan::HTTP do
     describe :put do
       it :success do
         allow(http).to receive(:put).\
-          with("/ping", "param1=value1&param2=value2", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+          with("/ping", "param1=value1&param2=value2", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
           and_return(res)
         r = lm.request("/ping", :put, {param1: "value1", param2: "value2"})
         expect(r).to eq res
@@ -54,7 +63,7 @@ describe Libmagellan::HTTP do
     describe :delete do
       it :success do
         allow(http).to receive(:delete).\
-          with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+          with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
           and_return(res)
         r = lm.request("/ping", :delete)
         expect(r).to eq res
@@ -76,7 +85,7 @@ describe Libmagellan::HTTP do
       allow(res).to receive(:code).and_return("200")
       allow(res).to receive(:body).and_return("pong\n")
       allow(http).to receive(:get).\
-        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
         and_return(res)
       r = lm.test_ping
       expect(r).to eq lm
@@ -84,13 +93,13 @@ describe Libmagellan::HTTP do
 
     it :connection_failure_1_time do
       allow(http).to receive(:get).\
-        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
         once.\
         and_raise(Errno::ECONNREFUSED)
       allow(res).to receive(:code).and_return("200")
       allow(res).to receive(:body).and_return("pong\n")
       allow(http).to receive(:get).\
-        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
         and_return(res)
       r = lm.test_ping
       expect(r).to eq lm
@@ -98,7 +107,7 @@ describe Libmagellan::HTTP do
 
     it :connection_failure do
       allow(http).to receive(:get).\
-        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
         exactly(3).times.\
         and_raise(Errno::ECONNREFUSED)
       expect{ lm.test_ping(max_retry_count: 2, retry_interval: 0) }.to raise_error(Errno::ECONNREFUSED)
@@ -108,7 +117,7 @@ describe Libmagellan::HTTP do
       allow(res).to receive(:code).and_return("500")
       allow(res).to receive(:body).and_return("Something wrong!")
       allow(http).to receive(:get).\
-        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store", "Client-Version" => "0.0.1")).\
+        with("/ping", hash_including("Authorization" => an_instance_of(String), "Cache-Control" => "no-store")).\
         and_return(res)
       expect{ lm.test_ping }.to raise_error(Libmagellan::InvalidResponse)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libmagellan
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet