matrix_sdk 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b922104b5ab91c432c502117ed7f8f6a4c25121a8c407658427c28a9a9f47a3
-  data.tar.gz: 99bc5b83c327b3ac326ce4515f77bd9801c260797036daaf2cb4192e08e74ec1
+  metadata.gz: 444586f27d6c0e30f71f5a9c064c0a3690ac692c819c477642fd143949d06c67
+  data.tar.gz: 5391c9869e9534f2e3fffd09313423c12228e90931d41d5e3724795b96ea4d20
 SHA512:
-  metadata.gz: cd9020a5792c251aca178339ecd836495b07e414e7121711be4af78aef5fdd45d2c106fb59f9bead22767825dd694d0a43429c3db7c394bd90d9b48ddb9517c2
-  data.tar.gz: d0a15efe764f0b6b9d0fd0ec11f50385da455a1fa3e3ad92f092cfd728f377726f3d84e4d961554519b724e6dc6e402113767050281e55bcee6e9328604091d2
+  metadata.gz: 641b169f971c77acc2123f3750f920aff520074972e5bf307706a0bd644eafd9415a4a7d2a9996f9389aed40683da823c26615b6766b0785fdaeec3c9686be71
+  data.tar.gz: 6c0486fab519db6bc9e33bd1f3826d49128d84974d463105d82370461fba2dba3e6aa44f9b2dc0b4662e8bb4d43106b9b10025833b3be860f68402dc32737bdb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.1 - 2019-06-05
+
+- Fixes a faulty include which broke the single implemented S2S endpoint
+- Replaces the room name handling with a cached lazy loading system
+
 ## v1.1.0 - 2019-06-04
 
 - The create_room method in the client abstraction now automatically stores the created room

data/lib/matrix_sdk/api.rb

@@ -13,7 +13,7 @@ module MatrixSdk
     include MatrixSdk::Protocols::AS
     include MatrixSdk::Protocols::CS
     include MatrixSdk::Protocols::IS
-    include MatrixSdk::Protocols::CS
+    include MatrixSdk::Protocols::SS
 
     USER_AGENT = "Ruby Matrix SDK v#{MatrixSdk::VERSION}"
     DEFAULT_HEADERS = {

data/lib/matrix_sdk/protocols/ss.rb

@@ -3,7 +3,7 @@
 module MatrixSdk::Protocols::SS
   # Gets the server version
   def server_version
-    Response.new(self, request(:get, :federation_v1, '/version').server).tap do |resp|
+    MatrixSdk::Response.new(self, request(:get, :federation_v1, '/version').server).tap do |resp|
       resp.instance_eval <<-'CODE', __FILE__, __LINE__ + 1
         def to_s
           "#{name} #{version}"

data/lib/matrix_sdk/room.rb

@@ -39,7 +39,7 @@ module MatrixSdk
     #   @return [Array(Object)] the last +event_history_limit+ events to arrive in the room
     #   @see https://matrix.org/docs/spec/client_server/r0.3.0.html#get-matrix-client-r0-sync
     #        The timeline events are what will end up in here
-    attr_reader :id, :client, :name, :topic, :aliases, :members, :events
+    attr_reader :id, :client, :topic, :aliases, :members, :events
 
     # @!attribute [r] on_event
     #   @return [EventHandlerArray] The list of event handlers for all events
@@ -81,6 +81,8 @@ module MatrixSdk
         instance_variable_set("@#{k}", v) if instance_variable_defined? "@#{k}"
       end
 
+      @name_checked = Time.new(0)
+
       logger.debug "Created room #{room_id}"
     end
 
@@ -125,6 +127,16 @@ module MatrixSdk
       members
     end
 
+    def name
+      return @name if Time.now - @name_checked < 10
+
+      @name_checked = Time.now
+      @name ||= client.api.get_room_name(id)
+    rescue MatrixNotFoundError
+      # No room name has been specified
+      nil
+    end
+
     # Gets the avatar url of the room - if any
     def avatar_url
       @avatar_url ||= client.api.get_room_state(id, 'm.room.avatar').url
@@ -410,12 +422,14 @@ module MatrixSdk
     # Reloads the name of the room
     # @return [Boolean] if the name was changed or not
     def reload_name!
-      data = client.api.get_room_name(id)
-      changed = data[:name] != name
+      data = begin
+               client.api.get_room_name(id)
+             rescue MatrixNotFoundError
+               nil
+             end
+      changed = data[:name] != @name
       @name = data[:name] if changed
       changed
-    rescue MatrixNotFoundError
-      nil
     end
     alias refresh_name! reload_name!
 
@@ -427,12 +441,14 @@ module MatrixSdk
     # Reloads the topic of the room
     # @return [Boolean] if the topic was changed or not
     def reload_topic!
-      data = client.api.get_room_topic(id)
-      changed = data[:topic] != topic
+      data = begin
+               client.api.get_room_topic(id)
+             rescue MatrixNotFoundError
+               nil
+             end
+      changed = data[:topic] != @topic
       @topic = data[:topic] if changed
       changed
-    rescue MatrixNotFoundError
-      nil
     end
     alias refresh_topic! reload_topic!
 
@@ -449,18 +465,21 @@ module MatrixSdk
     # @note The list of aliases is not sorted, ordering changes will result in
     #       alias list updates.
     def reload_aliases!
-      data = client.api.get_room_state(id)
-      new_aliases = data.select { |chunk| chunk[:type] == 'm.room.aliases' && chunk.key?(:content) && chunk[:content].key?(:aliases) }
-                        .map { |chunk| chunk[:content][:aliases] }
-                        .flatten
-                        .compact
+      begin
+        new_aliases = client.api.get_room_state(id, 'm.room.aliases').aliases
+      rescue MatrixNotFoundError
+        data = client.api.get_room_state(id)
+        new_aliases = data.select { |chunk| chunk[:type] == 'm.room.aliases' && chunk.key?(:content) && chunk[:content].key?(:aliases) }
+                          .map { |chunk| chunk[:content][:aliases] }
+                          .flatten
+                          .compact
+      end
+
       return false if new_aliases.nil?
 
       changed = new_aliases != aliases
       @aliases = new_aliases if changed
       changed
-    rescue MatrixNotFoundError
-      nil
     end
     alias refresh_aliases! reload_aliases!
 

data/lib/matrix_sdk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MatrixSdk
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SDK for applications using the Matrix protocol