Enable rubo (#105)

Author: ferhatelmas

.github/workflows/ci.yml

@@ -23,5 +23,5 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-          # bundle exec rake rubocop
+          bundle exec rake rubocop
           bundle exec rake test

.gitignore

@@ -4,9 +4,11 @@ coverage/
 Gemfile.lock
 gemfiles/*.lock
 .DS_Store
+vendor/
+
+.bundle
+.envrc
 
-# IDE's and editors
 .idea
-*.sublime-workspace
 
-test.sh
+test.sh

Gemfile

@@ -1,4 +1,3 @@
-# A sample Gemfile
 source 'https://rubygems.org'
 
 gemspec
@@ -8,8 +7,5 @@ group :test do
 end
 
 group :dev do
-  gem 'method_source'
-  gem 'pry'
-  gem 'pry-doc'
-  gem 'rubocop', require: false
+  gem 'rubocop', require: true
 end

gemfiles/Gemfile.rails-5.0

@@ -5,3 +5,11 @@ gem 'rake'
 gem 'actionpack', '~> 5.0.0'
 gem 'railties', '~> 5.0.0'
 gem 'activerecord', '~> 5.0.0'
+
+group :test do
+  gem 'simplecov', require: false
+end
+
+group :dev do
+  gem 'rubocop', require: true
+end

gemfiles/Gemfile.rails-5.2

@@ -5,3 +5,11 @@ gem 'rake'
 gem 'actionpack', '~> 5.2.0'
 gem 'railties', '~> 5.2.0'
 gem 'activerecord', '~> 5.2.0'
+
+group :test do
+  gem 'simplecov', require: false
+end
+
+group :dev do
+  gem 'rubocop', require: true
+end

gemfiles/Gemfile.rails-6.0

@@ -7,3 +7,11 @@ gem 'railties', '~> 6.0.0'
 gem 'activerecord', '~> 6.0.0'
 
 gem 'sqlite3', '~> 1.4'
+
+group :test do
+  gem 'simplecov', require: false
+end
+
+group :dev do
+  gem 'rubocop', require: true
+end

gemfiles/Gemfile.rails-6.1

@@ -7,3 +7,11 @@ gem 'railties', '~> 6.1.0'
 gem 'activerecord', '~> 6.1.0'
 
 gem 'sqlite3', '~> 1.4'
+
+group :test do
+  gem 'simplecov', require: false
+end
+
+group :dev do
+  gem 'rubocop', require: true
+end

lib/stream_rails/activity.rb

@@ -7,7 +7,7 @@ def create_reference(record)
       if record.is_a?(ActiveRecord::Base) || (Object.const_defined?('Sequel') && record.is_a?(Sequel::Model))
         "#{record.class.model_name}:#{record.id}"
       else
-        record.to_s unless record.nil?
+        record&.to_s
       end
     end
   end

lib/stream_rails/enrich.rb

@@ -10,8 +10,8 @@ def initialize
       super
     end
 
-    def from_activity(h)
-      merge(h)
+    def from_activity(from)
+      merge(from)
     end
 
     def enriched?
@@ -31,7 +31,7 @@ class Enrich
     attr_reader :fields
 
     def initialize(fields = nil)
-      @fields = fields || [:actor, :object, :target]
+      @fields = fields || %i[actor object target]
     end
 
     def add_fields(new_fields)
@@ -47,9 +47,9 @@ def model_field?(field_value)
       begin
         model.classify.constantize
       rescue NameError
-        return false
+        false
       else
-        return true
+        true
       end
     end
 
@@ -77,6 +77,7 @@ def collect_references(activities)
       activities.each do |activity|
         activity.select { |k, _v| @fields.include? k.to_sym }.each do |_field, value|
           next unless model_field?(value)
+
           model, _, id = value.rpartition(':')
           model_refs[model][id] = 0
         end
@@ -85,13 +86,18 @@ def collect_references(activities)
     end
 
     def retrieve_objects(references)
-      Hash[references.map { |model, ids| [model, Hash[model.classify.constantize.where(model.classify.constantize.primary_key => ids.keys).map { |i| [i.id.to_s, i] }]] }]
+      references.map do |model, ids|
+        [model, model.classify.constantize.where(model.classify.constantize.primary_key => ids.keys).map do |i|
+          [i.id.to_s, i]
+        end.to_h]
+      end.to_h
     end
 
     def inject_objects(activities, objects)
       create_activity_results(activities).each do |activity|
         activity.select { |k, _v| @fields.include? k.to_sym }.each do |field, value|
           next unless model_field?(value)
+
           model, _, id = value.rpartition(':')
           activity[field] = objects[model][id] || value
           activity.track_not_enriched_field(field, value) if objects[model][id].nil?
@@ -102,7 +108,7 @@ def inject_objects(activities, objects)
     private
 
     def create_activity_results(activities)
-      return activities.map { |a| ActivityResult.new.from_activity(a) }
+      activities.map { |a| ActivityResult.new.from_activity(a) }
     end
   end
 end

lib/stream_rails/feed_manager.rb

@@ -15,7 +15,7 @@ def get_user_feed(user_id)
     end
 
     def get_news_feeds(user_id)
-      Hash[@news_feeds.map { |feed_name, feed_slug| [feed_name, get_feed(feed_slug, user_id)] }]
+      @news_feeds.transform_values { |feed_slug| get_feed(feed_slug, user_id) }
     end
 
     def get_notification_feed(user_id)
@@ -28,6 +28,7 @@ def get_feed(feed_type, user_id)
 
     def follow_user(user_id, target_id)
       return unless StreamRails.enabled?
+
       target_feed = get_user_feed(target_id)
       @news_feeds.each do |_, feed|
         news_feed = get_feed(feed, user_id)
@@ -37,6 +38,7 @@ def follow_user(user_id, target_id)
 
     def unfollow_user(user_id, target_id)
       return unless StreamRails.enabled?
+
       target_feed = get_user_feed(target_id)
       @news_feeds.each do |_, feed|
         news_feed = get_feed(feed, user_id)
@@ -50,13 +52,15 @@ def get_owner_feed(instance)
 
     def created_activity(instance)
       return unless StreamRails.enabled? && instance.activity_should_sync?
+
       activity = instance.create_activity
       feed = get_owner_feed(instance)
       feed.add_activity(activity)
     end
 
     def destroyed_activity(instance)
       return unless StreamRails.enabled?
+
       feed = get_owner_feed(instance)
       feed.remove(instance.activity_foreign_id, true)
     end