chatrix 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fdbaf53540d109264fd47203f5bf8371b7a0e0d
-  data.tar.gz: e618549b57e588e22fe091b3f7538053088a97e3
+  metadata.gz: 9ba46cb5ec75d859c02dd7ed213b2b21a4e7f5ee
+  data.tar.gz: bbf09105a61342db53fd688099b3f5269719aabd
 SHA512:
-  metadata.gz: 2ea913a13a9257f27fdccdf36a4a013360bbc2d0c7c0756978f633152351c33aaa7e9e574ae177e050d438f7d3997db41f5d64f2a726dc43e460c5db60188261
-  data.tar.gz: ccf53b6718e921aa22fc1a6354997155de119baa19a75bb594b8c380e159bfbc7b2a57673e61c48e50645be2badb2d35a26b53cbd1ae1636b6909b3587b09bd2
+  metadata.gz: f20497370325083e5a5cc579214c62650dc85b3faed414e5681adf3a22832b56242e0169e68b0e45a998ff311569045b99e03f236e474fc93d849bff1bbae2cc
+  data.tar.gz: 95b602dbbf88af113c91072b7e1c21f7fac9a1762b3dee8eb20f93ffdfeeb360ddc6eabdf19c413ab63e7fd992a9ac1be074e4723d96abe05b888dc36419b199

data/Gemfile

@@ -8,6 +8,11 @@ gemspec
 
 group :development do
   gem 'pry', '~> 0.10'
+
+  gem 'guard', '~> 2.14'
+  gem 'guard-bundler', '~> 2.1', require: false
+  gem 'guard-rspec', '~> 4.7', require: false
+  gem 'guard-rubocop', '~> 1.2'
 end
 
 group :test do

data/Guardfile

@@ -0,0 +1,42 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance'
+  end
+end
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end
+
+guard :rubocop do
+  watch(/.+\.rb$/)
+  watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+end

data/lib/chatrix/client.rb

@@ -37,6 +37,8 @@ module Chatrix
         room.on(:invited) { |s, i| broadcast(:invited, room, s, i) }
         room.timeline.on(:message) { |r, m| broadcast(:room_message, r, m) }
       end
+
+      on(:disconnected) { stop_syncing }
     end
 
     # Starts syncing against the homeserver.
@@ -53,7 +55,6 @@ module Chatrix
         rescue => e
           broadcast(:connection_error, e)
         ensure
-          stop_syncing
           broadcast(:disconnected)
         end
       end

data/lib/chatrix/components/state.rb

@@ -140,7 +140,7 @@ module Chatrix
       # @param event [Hash] The member event.
       def handle_member(event)
         @users.process_member_event self, event
-        user = @users[event['sender']]
+        user = @users[event['state_key']]
         membership = event['content']['membership'].to_sym
 
         # Don't process invite state change if the user is already a

data/lib/chatrix/user.rb

@@ -38,6 +38,14 @@ module Chatrix
       @memberships[room][:power] || 0
     end
 
+    # Checks if this user is a member of the specified room.
+    # @param room [Room] The room to check.
+    # @return [Boolean] `true` if the user is a member in the room,
+    #   otherwise `false`.
+    def member?(room)
+      @memberships.key?(room) && @memberships[room][:type] == :join
+    end
+
     # Process a member event.
     #
     # @param room [Room] The room that sent the event.

data/lib/chatrix/users.rb

@@ -35,7 +35,8 @@ module Chatrix
     # @param event [Hash] Event data.
     def process_member_event(room, event)
       return if Events.processed? event
-      get_user(event['sender']).process_member_event room, event
+      id = event['state_key'] || event['sender']
+      get_user(id).process_member_event room, event
     end
 
     # Process power level updates.

data/lib/chatrix/version.rb

@@ -3,5 +3,5 @@
 
 module Chatrix
   # The current version of this gem.
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatrix
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam Hellberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,6 +66,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile