matrix_dbus 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0abea51845bfb868f2c2c350cfdc8e798f003ec
-  data.tar.gz: 48aae892c08bceb438402a2f0f21ebcb89e24b81
+  metadata.gz: 4ebf2f32f1469b4f1b51d9b95b40c8c1c0f5baeb
+  data.tar.gz: 3654864c75694264fe3bab451643aab2aed45e8c
 SHA512:
-  metadata.gz: 807b960256087765b394125c5e38661fdb3201f2f0197d07f597d97b42f99aa2ac3beb95c93a2796acb1d54469963cf9b9437e71e69174ddd4aca90ad428fa7c
-  data.tar.gz: 0ccba6afdc62cbc50dfffe540ff359c70f7df6b29d070b640a69c50830cfae1178c6504045347d67dbf209357c3a6921acd0fa2f6e09df1b793bd889ee46c2c0
+  metadata.gz: 890775cca95492ea0ef54aa1a8eb93ad2db5f0e29679773c0b3452ade8203dcc14901bb78436f8a5f52ebddb5acfeb42627ba4e99aed72f84871ef9f0b8d2cb7
+  data.tar.gz: 7c550514c6452dc32c79e9bb82d747963f342d23a0ec9d7ba1f7b7b912f0d1a364ffa179c4b7dfce9a02562b49537644cdfdf93fa878c69e4e6b4b2181f117f7

data/exe/matrix-dbus

@@ -4,12 +4,12 @@ require 'matrix_dbus'
 Thread.abort_on_exception = true
 
 def send_if_exist(obj, name, json)
-  obj.method(name).call json.to_json unless json.empty?
+  obj.method(name).call JSON.pretty_generate json unless json.empty?
 end
 
 def matrix2dbus(c, obj)
   j = c.json
-  obj.all j.to_json
+  obj.all JSON.pretty_generate j
 
   %i[account_data to_device presence].each do |name|
     send_if_exist obj, name, j[name.to_s]['events']

data/lib/matrix_dbus/dbus.rb

@@ -14,33 +14,42 @@ module MatrixDBus
 
     dbus_interface 'org.dastudio.matrix' do
       %i[post put].each do |way|
-        dbus_method way, 'in url:s, in args:s' do |url, args|
+        dbus_method way, 'in url:s, in args:s, out res:s' do |url, args|
+          args = '{}' if args == ''
           args = JSON.parse args
           url = URI(url)
           url.query = URI.encode_www_form access_token: @matrix.access_token
+          url = url.to_s
           begin
-            @matrix.network.method(way).call url.to_s, args
+            [@matrix.network.method(way).call(url, args).to_json]
           rescue RestClient::Exception => e
+            puts e
             puts e.response.body
           end
         end
       end
 
       %i[get delete].each do |way|
-        dbus_method way, 'in url:s, in args:s' do |url, args|
+        dbus_method way, 'in url:s, in args:s, out res:s' do |url, args|
+          args = '{}' if args == ''
           args = JSON.parse args
           args[:access_token] = @matrix.access_token
           begin
-            @matrix.network.method(way).call url, args
+            [@matrix.network.method(way).call(url, args).to_json]
           rescue RestClient::Exception => e
+            puts e
             puts e.response.body
           end
         end
       end
 
-      dbus_method :post_raw, 'in url:s, in body:s' do |url, body|
-        body = Base64.decode64 body
-        @matrix.network.post_raw url, body
+      dbus_method :post_raw, 'in url:s, in body:s, out res:s' do |url, body|
+        begin
+          [@matrix.network.post_raw(url, Base64.decode64(body)).to_json]
+        rescue RestClient::Exception => e
+          puts e
+          puts e.response.body
+        end
       end
 
       %i[

data/lib/matrix_dbus/version.rb

@@ -1,3 +1,3 @@
 module MatrixDBus
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_dbus
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler