simple-feed 2.0.2 → 2.1.0

data/lib/simplefeed/providers/redis/provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redis'
 require 'base62-rb'
 require 'forwardable'
@@ -21,7 +23,6 @@ module SimpleFeed
       #     u.afkj234.meta: { total: 2, unread: 2, last_read: 2016-11-20 22:00:34 -08:00 GMT }
       #   ```
       class Provider < ::SimpleFeed::Providers::Base::Provider
-
         # SimpleFeed::Providers.define_provider_methods(self) do |provider, method, **opts, &block|
         #   users = Users.new(provider: provider, user_ids: opts.delete(:user_ids))
         #   opts.empty? ?
@@ -48,6 +49,7 @@ module SimpleFeed
 
         def delete_if(user_ids:)
           raise ArgumentError, '#delete_if must be called with a block that receives (user_id, event) as arguments.' unless block_given?
+
           with_response_batched(user_ids) do |key|
             fetch(user_ids: [key.user_id])[key.user_id].map do |event|
               with_redis do |redis|
@@ -129,7 +131,7 @@ module SimpleFeed
           end
         end
 
-        FEED_METHODS = %i(total_memory_bytes total_users last_disk_save_time)
+        FEED_METHODS = %i(total_memory_bytes total_users last_disk_save_time).freeze
 
         def total_memory_bytes
           with_stats(:used_memory_since_boot)
@@ -147,39 +149,39 @@ module SimpleFeed
 
         def transform_response(user_id = nil, result)
           case result
-            when ::Redis::Future
-              transform_response(user_id, result.value)
+          when ::Redis::Future
+            transform_response(user_id, result.value)
 
-            when ::Hash
+          when ::Hash
 
-              if result.values.any? { |v| transformable_type?(v) }
-                result.each { |k, v| result[k] = transform_response(user_id, v) }
-              else
-                result
-              end
+            if result.values.any? { |v| transformable_type?(v) }
+              result.each { |k, v| result[k] = transform_response(user_id, v) }
+            else
+              result
+            end
 
-            when ::Array
+          when ::Array
 
-              if result.any? { |v| transformable_type?(v) }
-                result = result.map { |v| transform_response(user_id, v) }
-              end
+            if result.any? { |v| transformable_type?(v) }
+              result = result.map { |v| transform_response(user_id, v) }
+            end
 
-              if result.size == 2 && result[1].is_a?(Float)
-                SimpleFeed::Event.new(value: result[0], at: Time.at(result[1]))
-              else
-                result
-              end
+            if result.size == 2 && result[1].is_a?(Float)
+              SimpleFeed::Event.new(value: result[0], at: Time.at(result[1]))
+            else
+              result
+            end
 
-            when ::String
-              if result =~ /^\d+\.\d+$/
-                result.to_f
-              elsif result =~ /^\d+$/
-                result.to_i
-              else
-                result
-              end
+          when ::String
+            if result =~ /^\d+\.\d+$/
+              result.to_f
+            elsif result =~ /^\d+$/
+              result.to_i
             else
               result
+            end
+          else
+            result
           end
         end
 
@@ -194,9 +196,9 @@ module SimpleFeed
 
         private
 
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
         # helpers
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
 
         def reset_users_last_read(redis, key, time = nil)
           time = time.nil? ? Time.now.to_f : time.to_f
@@ -214,9 +216,9 @@ module SimpleFeed
           redis.zrevrange(key.data, (page - 1) * per_page, page * per_page - 1, withscores: true)
         end
 
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
         # Operations with response
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
 
         def with_response_pipelined(user_ids, response = nil)
           with_response(response) do |response|
@@ -234,9 +236,9 @@ module SimpleFeed
           end
         end
 
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
         # Batch operations
-        #——————————————————————————————————————————————————————————————————————————————————————
+        # ——————————————————————————————————————————————————————————————————————————————————————
         def batch_pipelined(user_ids)
           to_array(user_ids).each_slice(batch_size) do |batch|
             with_pipelined do |redis|

data/lib/simplefeed/providers/redis/stats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redis'
 require 'hashie/mash'
 require 'yaml'
@@ -6,7 +8,6 @@ module SimpleFeed
   module Providers
     module Redis
       class Stats
-
         attr_accessor :redis
 
         def initialize(redis)
@@ -56,27 +57,25 @@ module SimpleFeed
           end
 
           def load_boot_stats!
-            @boot_info ||= destringify(YAML.load(File.open(File.expand_path('../boot_info.yml', __FILE__))))
+            @boot_info ||= destringify(YAML.load(File.open(File.expand_path('boot_info.yml', __dir__))))
           end
-
         end
 
         load_boot_stats!
 
         boot_info.keys.each do |key|
-          unless key.to_s =~ /^db[0-9]+/
+          next if key.to_s =~ /^db[0-9]+/
 
-            define_method(key.to_sym) do
-              info[key]
-            end
+          define_method(key.to_sym) do
+            info[key]
+          end
 
-            define_method("#{key}_at_boot".to_sym) do
-              boot_info[key]
-            end
+          define_method("#{key}_at_boot".to_sym) do
+            boot_info[key]
+          end
 
-            define_method("#{key}_since_boot".to_sym) do
-              info[key] - boot_info[key]
-            end
+          define_method("#{key}_since_boot".to_sym) do
+            info[key] - boot_info[key]
           end
         end
       end

data/lib/simplefeed/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'hashie'
 require 'forwardable'
 require 'simplefeed'
@@ -29,7 +31,7 @@ module SimpleFeed
         key_or_user_id.user_id :
         key_or_user_id
 
-      @result[user_id] = result ? result : yield(@result[user_id])
+      @result[user_id] = result || yield(@result[user_id])
     end
 
     def user_ids
@@ -61,7 +63,7 @@ module SimpleFeed
     end
 
     def result(user_id = nil)
-      if user_id then
+      if user_id
         @result[user_id]
       else
         if @result.values.size == 1

data/lib/simplefeed/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleFeed
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/simple-feed.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simplefeed/version'
 
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Konstantin Gredeskoul']
   spec.email         = ['kigster@gmail.com']
 
-  spec.summary       = %q{Create multiple types of social networking activity feeds with simple-feed gem, which uses a pluggable backend provider implementation, and ships with a Redis provider by default.}
-  spec.description   = %q{This gem implements flexible time-ordered activity feeds commonly used withing social networking applications. As events occur, they are pushed into the Feed and distributed to all users that need to see the event. Upon the user visiting their "feed page", a pre-populated ordered list of events is returned by the library. Typically the data stored in the feed is a short-hand condensed variant of models, but it can also be a fully Marshalled objects, or JSON serializations. }
+  spec.summary       = 'Create multiple types of social networking activity feeds with simple-feed gem, which uses a pluggable backend provider implementation, and ships with a Redis provider by default.'
+  spec.description   = 'This gem implements flexible time-ordered activity feeds commonly used withing social networking applications. As events occur, they are pushed into the Feed and distributed to all users that need to see the event. Upon the user visiting their "feed page", a pre-populated ordered list of events is returned by the library. Typically the data stored in the feed is a short-hand condensed variant of models, but it can also be a fully Marshalled objects, or JSON serializations. '
   spec.homepage      = 'https://github.com/kigster/simple-feed'
   spec.license       = 'MIT'
 
@@ -22,21 +23,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'base62-rb'
+  spec.add_dependency 'colored2'
+  spec.add_dependency 'connection_pool', '~> 2'
+  spec.add_dependency 'hashie'
   spec.add_dependency 'hiredis'
   spec.add_dependency 'redis'
-  spec.add_dependency 'hashie'
-  spec.add_dependency 'connection_pool', '~> 2'
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'colored2'
 
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'simplecov', '~> 0.12'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
-  spec.add_development_dependency 'knjrbfw'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'uuid'
+  spec.add_development_dependency 'yard'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: simple-feed
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: base62-rb
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hiredis
+  name: base62-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,35 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: knjrbfw
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,35 +207,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -247,15 +261,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".relaxed-rubocop-2.4.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
 - Guardfile
 - LICENSE.txt
-- README.md
+- README.adoc
 - Rakefile
 - bin/console
 - bin/setup
@@ -313,8 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Create multiple types of social networking activity feeds with simple-feed