matrix_dbus 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be28175a6c49d37d25cd9718c6ef74d6e79b5321
-  data.tar.gz: 3b89ba6a7be1f4aefbc5e630364af57b774419aa
+  metadata.gz: 5a4b6b0fe7996571369fee0429fbf8df75dae94a
+  data.tar.gz: '0802e9e5e39f75a8d42093f5aef34ac0c8f9d864'
 SHA512:
-  metadata.gz: 381d61801c7ba0e06853d3c0a338b3cf14afc5e6267080b0711010c2d3c1f094368951af8d094875a94e8839ddacbf663b66eed015278e0c6ec9117b5ba30062
-  data.tar.gz: e19887e518b3ecf90db293e70f3e7d8fd116bcb2cd75e0a1c8edd2d028f87deec5f283454dbc74cd06df08110d384119de735a79c16defe485445392fc92f062
+  metadata.gz: fc2516b28cabd6ceef5c23f32b4cf48ad93c109b6c0643ca824ba8610cfa0e63eaf4cf07bde1ae045803bf07ed7317582e45548e956270b98c8710efc7106d53
+  data.tar.gz: 86a8bcee1901c314acf4992657cfaf972fd1e0c6c317f23cf5cdd693667a1bf807b268733365677c8f9351753ccb63dc2fc1d53a23aa33b69f1db8ffb740cda4

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in matrix_dbus.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "matrix_dbus"
+require 'bundler/setup'
+require 'matrix_dbus'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "matrix_dbus"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/exe/matrix-dbus

@@ -4,25 +4,33 @@ require 'matrix_dbus'
 Thread.abort_on_exception = true
 
 def send_if_exist(obj, name, json)
-  obj.method(name).call JSON.pretty_generate json unless json.empty?
+  obj.send name, JSON.pretty_generate(json) unless json.empty?
 end
 
 def matrix2dbus(c, obj)
-  j = c.json
-  obj.all JSON.pretty_generate j
+  json = c.json
+  %i[normal rooms device].each { |a| send a, obj, json }
+end
+
+def normal(obj, json)
+  obj.all JSON.pretty_generate json
 
-  %i[account_data to_device presence].each do |name|
-    send_if_exist obj, name, j[name.to_s]['events']
+  %w[account_data to_device presence].each do |name|
+    send_if_exist obj, name, json[name]['events']
   end
+end
 
-  send_if_exist obj, :rooms, j['rooms']
-  %i[leave join invite].each do |name|
-    send_if_exist obj, name, j['rooms'][name.to_s]
+def rooms(obj, json)
+  send_if_exist obj, :rooms, json['rooms']
+  %w[leave join invite].each do |name|
+    send_if_exist obj, name, json['rooms'][name]
   end
+end
 
-  send_if_exist obj, :device_lists, j['device_lists']
-  %i[changed left].each do |name|
-    send_if_exist obj, name, j['device_lists'][name.to_s]
+def device(obj, json)
+  send_if_exist obj, :device_lists, json['device_lists']
+  %w[changed left].each do |name|
+    send_if_exist obj, name, json['device_lists'][name]
   end
 end
 

data/lib/matrix_dbus/dbus.rb

@@ -12,16 +12,26 @@ module MatrixDBus
       Thread.new { @matrix.run }
     end
 
+    def self.return(info)
+      [JSON.pretty_generate(info)]
+    end
+
+    # rubocop:disable Metrics/BlockLength
     dbus_interface 'org.dastudio.matrix' do
-      %i[post put].each do |way|
+      %i[post put get delete].each do |way|
         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
+          if %i[get delete].include? way
+            args[:access_token] = @matrix.access_token
+          elsif %i[post put].include? way
+            url = URI(url)
+            url.query = URI.encode_www_form access_token: @matrix.access_token
+            url = url.to_s
+          else raise 'Connot raise'
+          end
           begin
-            [@matrix.network.method(way).call(url, args).to_json]
+            Matrix2DBus.return @matrix.network.method(way).call(url, args)
           rescue RestClient::Exception => e
             puts e
             puts e.response.body
@@ -29,23 +39,24 @@ module MatrixDBus
         end
       end
 
-      %i[get delete].each do |way|
-        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).to_json]
-          rescue RestClient::Exception => e
-            puts e
-            puts e.response.body
-          end
+      dbus_method :post_raw, 'in url:s, in body:s, out res:s' do |url, body|
+        begin
+          data = Base64.decode64 body
+          Matrix2DBus.return @matrix.network.post_raw(url, data)
+        rescue RestClient::Exception => e
+          puts e
+          puts e.response.body
         end
       end
 
-      dbus_method :post_raw, 'in url:s, in body:s, out res:s' do |url, body|
+      dbus_method :upload_file, 'in file:s, out mxc:s' do |file|
+        url = URI('/upload')
+        url.query = URI.encode_www_form access_token: @matrix.access_token
+        url = url.to_s
         begin
-          [@matrix.network.post_raw(url, Base64.decode64(body)).to_json]
+          File.open(file, 'rb') do |f|
+            Matrix2DBus.return @matrix.network.post_raw(url, f)
+          end
         rescue RestClient::Exception => e
           puts e
           puts e.response.body

data/lib/matrix_dbus/version.rb

@@ -1,3 +1,3 @@
 module MatrixDBus
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_dbus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,6 @@ files:
 - bin/setup
 - exe/matrix-dbus
 - lib/matrix_dbus.rb
-- lib/matrix_dbus/api.rb
 - lib/matrix_dbus/dbus.rb
 - lib/matrix_dbus/matrix.rb
 - lib/matrix_dbus/network.rb

data/lib/matrix_dbus/api.rb

@@ -1,52 +0,0 @@
-#
-module MatrixAPI
-  def get(url)
-    uri = @host + '/_matrix/client/r0' + url
-    puts 'GET URL:', uri if $VERBOSE
-    JSON.parse RestClient.get(uri).body
-  rescue RestClient::Exceptions::OpenTimeout
-    retry
-  rescue RestClient::BadGateway
-    retry
-  end
-
-  def post(url, body)
-    uri = @host + '/_matrix/client/r0' + url
-    puts 'POST URL:', uri if $VERBOSE
-    JSON.parse RestClient.post(
-      uri,
-      body,
-      content_type: :json,
-      accept: :json
-    ).body
-  rescue RestClient::Exceptions::OpenTimeout
-    retry
-  rescue RestClient::BadGateway
-    retry
-  end
-
-  def put(url, body)
-    uri = @host + '/_matrix/client/r0' + url
-    puts 'PUT URL:', uri if $VERBOSE
-    JSON.parse RestClient.put(
-      uri,
-      body.to_json,
-      content_type: :json,
-      accept: :json
-    ).body
-  rescue RestClient::Exceptions::OpenTimeout
-    retry
-  rescue RestClient::BadGateway
-    retry
-  end
-
-  def upload_file(file, token)
-    uri = @host + '/_matrix/media/r0/upload?access_token=' + token
-    puts 'POST URL:', uri if $VERBOSE
-    JSON.parse(RestClient.post(uri, file).body)['content_uri']
-  rescue RestClient::Exceptions::OpenTimeout
-    retry
-  rescue RestClient::BadGateway
-    retry
-  end
-end