stream-ruby 2.10.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46f30b8b5b9225d17473b0f6d40dc62e8ef622a060dfd5bf89725878f5c131d
-  data.tar.gz: ee771c68ca17e54afa507590dc57b19a11ae87623b7a83909f596aee2a607137
+  metadata.gz: 31aab2710cc563a2d15372a93ef3c7247525e3579a0fc3208f08986cbdab50ba
+  data.tar.gz: 6d6c543c663e877798aad76d4af12c8b6c6db23bdbaa3fda050418bf460ff191
 SHA512:
-  metadata.gz: 6a976e51b5f9b88b9c436ebb528a721c7b1e316e36815710ec981bf6ccc0149ec7e8dabef2594ecd9ca986c4e9e52e018a88a0b7b793497a8d49b0d816277879
-  data.tar.gz: c348cafe7287e8b3e97b7d1404405793a99b7737056f1eee7e12b13201a75698547e5fb150dc2c213ccac65e871ecfc51eb548c2af04135cd5599619fbb839ec
+  metadata.gz: 5ee20ef5160fa068b869c4eace00310bcae8d7fc15e2730c01312015060b533deb68be4d944ada943042d7a2d84e3c83564599df76b2edb5f954db124bd81ca6
+  data.tar.gz: 814193cfdcd06a7376303fea24ce59c8881d914893e4fd336a85b093f757de642fd268c146112ff2cedd65185aef3e389757a9a10aec9a83493ea4f1c3f32ca6

data/README.md

@@ -1,5 +1,4 @@
-stream-ruby
-===========
+# stream-ruby
 
 [![Build Status](https://travis-ci.org/GetStream/stream-ruby.svg?branch=master)](https://travis-ci.org/GetStream/stream-ruby) [![Gem Version](https://badge.fury.io/rb/stream-ruby.svg)](http://badge.fury.io/rb/stream-ruby)
 
@@ -11,19 +10,14 @@ You can sign up for a Stream account at https://getstream.io/get_started.
 
 #### Ruby version requirements and support
 
-This API Client project requires Ruby 2.2.8 at a minimum. We will support the following versions:
-- 2.2.8
-- 2.3.1
-- 2.3.5
-- 2.4.2
-- 2.5.1
+This API Client project requires Ruby 2.5.x at a minimum.
 
 See the [Travis configuration](.travis.yml) for details of how it is built and tested.
 
 ### Installation
 
 ```bash
-gem install "stream-ruby"
+gem install 'stream-ruby'
 ```
 
 ### Full documentation
@@ -35,30 +29,43 @@ Documentation for this Ruby client are available at the [Stream website](https:/
 ```ruby
 # Instantiate a new client to connect to us east API endpoint
 require 'stream'
-client = Stream::Client.new('YOUR_API_KEY', 'API_KEY_SECRET', 'APP_ID', :location => 'us-east')
+client = Stream::Client.new('YOUR_API_KEY', 'API_KEY_SECRET', 'APP_ID', location: 'us-east')
+
 # Find your API keys here https://getstream.io/dashboard/
 
 # Instantiate a feed object
 user_feed_1 = client.feed('user', '1')
 
 # Get activities from 5 to 10 (slow pagination)
-result = user_feed_1.get(:limit=>5, :offset=>5)
+result = user_feed_1.get(limit: 5, offset: 5)
 # (Recommended & faster) Filter on an id less than the given UUID
-result = user_feed_1.get(:limit=>5, :id_lt=>'e561de8f-00f1-11e4-b400-0cc47a024be0')
+result =
+  user_feed_1.get(limit: 5, id_lt: 'e561de8f-00f1-11e4-b400-0cc47a024be0')
 
 # Create a new activity
-activity_data = {:actor => 1, :verb => 'tweet', :object => 1, :foreign_id => 'tweet:1'}
+activity_data = { actor: 1, verb: 'tweet', object: 1, foreign_id: 'tweet:1' }
 activity_response = user_feed_1.add_activity(activity_data)
 # Create a bit more complex activity
-activity_data = {:actor => 1, :verb => 'tweet', :object => 1, :foreign_id => 'tweet:1',
-	:course => {:name => 'Golden Gate park', :distance => 10},
-	:participants => ['Thierry', 'Tommaso'],
-	:started_at => DateTime.now()
+activity_data = {
+  actor: 1,
+  verb: 'tweet',
+  object: 1,
+  foreign_id: 'tweet:1',
+  course: { name: 'Golden Gate park', distance: 10 },
+  participants: %w[Thierry Tommaso],
+  started_at: DateTime.now
 }
 activity_response = user_feed_1.add_activity(activity_data)
 
 # Update an existing activity (requires both :foreign_id and :time fields)
-activity_data = {:actor => 1, :verb => 'tweet', :object => 1, :foreign_id => 'tweet:1', :popularity => 100, :time => '2016-05-13T16:12:30'}
+activity_data = {
+  actor: 1,
+  verb: 'tweet',
+  object: 1,
+  foreign_id: 'tweet:1',
+  popularity: 100,
+  time: '2016-05-13T16:12:30'
+}
 client.update_activity(activity_data)
 
 # Update activities
@@ -68,7 +75,7 @@ client.update_activities([activity_data])
 user_feed_1.remove_activity('e561de8f-00f1-11e4-b400-0cc47a024be0')
 
 # Remove activities by their foreign_id
-user_feed_1.remove_activity('tweet:1', foreign_id=true)
+user_feed_1.remove_activity('tweet:1', foreign_id: true)
 
 # Follow another feed
 user_feed_1.follow('flat', '42')
@@ -78,62 +85,45 @@ user_feed_1.unfollow('flat', '42')
 
 # Batch adding activities
 activities = [
-    [:actor => '1', :verb => 'tweet', :object => '1'],
-    [:actor => '2', :verb => 'like', :object => '3']
+  [actor: '1', verb: 'tweet', object: '1'],
+  [actor: '2', verb: 'like', object: '3']
 ]
 user_feed_1.add_activities(activities)
 
 # Batch following many feeds (requires ruby 2.1 or later)
 follows = [
-  {:source => 'flat:1', :target => 'user:1'},
-  {:source => 'flat:1', :target => 'user:2'},
-  {:source => 'flat:1', :target => 'user:3'},
+  { source: 'flat:1', target: 'user:1' },
+  { source: 'flat:1', target: 'user:2' },
+  { source: 'flat:1', target: 'user:3' }
 ]
 client.follow_many(follows)
 
 # Add an activity and push it to other feeds too using the `to` field
-data = [
-    :actor_id => '1',
-    :verb => 'like',
-    :object_id => '3',
-    :to => %w(user:44 user:45)
-]
+data = [actor_id: '1', verb: 'like', object_id: '3', to: %w[user:44 user:45]]
 user_feed_1.add_activity(data)
 
-# Remove a feed and its content
-user_feed_1.delete
-
 # Updating parts of an activity
 set = {
-  'product.price': 19.99,
-  'shares': {
-    'facebook': '...',
-    'twitter': '...'
-  },
+  'product.price': 19.99, 'shares': { 'facebook': '...', 'twitter': '...' }
 }
-unset = [
-    'daily_likes',
-    'popularity'
-]
+unset = %w[daily_likes popularity]
 # ...by ID
 client.activity_partial_update(
-  id: '54a60c1e-4ee3-494b-a1e3-50c06acb5ed4',
-  set: set,
-  unset: unset,
+  id: '54a60c1e-4ee3-494b-a1e3-50c06acb5ed4', set: set, unset: unset
 )
 # ...or by combination of foreign ID and time
 client.activity_partial_update(
   foreign_id: 'product:123',
   time: '2016-11-10T13:20:00.000000',
   set: set,
-  unset: unset,
+  unset: unset
 )
 
 # Generating tokens for client side usage
 token = user_feed_1.readonly_token
 
 # Javascript client side feed initialization
-user1 = client.feed('user', '1', '{{ token }}');
+user1 = client.feed('user', '1', '{{ token }}')
 
 # Retrieve first 10 followers of a feed
 user_feed_1.followers(0, 10)
@@ -148,16 +138,21 @@ user_feed_1.following(10)
 user_feed_1.following(10, 10)
 
 # Check if user_feed_1 follows specific feeds
-user_feed_1.following(0, 2, filter=['user:42', 'user:43'])
+user_feed_1.following(0, 2, filter = %w[user:42 user:43])
 
 # Add one activity to many feeds in one request
-feeds = %w(flat:1 flat:2 flat:3 flat:4)
-activity = {:actor => "User:2", :verb => "pin", :object => "Place:42", :target => "Board:1"}
+feeds = %w[flat:1 flat:2 flat:3 flat:4]
+activity = {
+  actor: 'User:2', verb: 'pin', object: 'Place:42', target: 'Board:1'
+}
 client.add_to_many(activity, feeds)
+
+# Retrive open graph information
+client.og('https://google.com')
 ```
 
 ### Copyright and License Information
 
-Copyright (c) 2014-2017 Stream.io Inc, and individual contributors. All rights reserved.
+Copyright (c) 2014-2020 Stream.io Inc, and individual contributors. All rights reserved.
 
 See the file "LICENSE" for information on the history of this software, terms & conditions for usage, and a DISCLAIMER OF ALL WARRANTIES.

data/lib/stream/activities.rb

@@ -1,6 +1,5 @@
 module Stream
   module Activities
-
     #
     # Get activities directly, via ID or Foreign ID + timestamp
     #
@@ -8,34 +7,33 @@ module Stream
     #
     # @return the found activities, if any.
     #
-    # @example
-    #
+    # @example Retrieve by activity IDs
+    #   @client.get_activities(
+    #     ids: [
+    #       '4b39fda2-d6e2-42c9-9abf-5301ef071b12',
+    #       '89b910d3-1ef5-44f8-914e-e7735d79e817'
+    #     ]
+    #   )
     #
-    # @client.get_activities(
-    #   ids: [
-    #     '4b39fda2-d6e2-42c9-9abf-5301ef071b12',
-    #     '89b910d3-1ef5-44f8-914e-e7735d79e817'
-    #   ]
-    # )
-    #
-    # @client.get_activities(
-    #   foreign_id_times: [
-    #     { foreign_id: 'post:1000', time: '2016-11-10T13:20:00.000000' },
-    #     { foreign_id: 'like:2000', time: '2018-01-07T09:15:59.123456' }
-    #   ]
-    # )
+    # @example Retrieve by Foreign IDs + timestamps
+    #   @client.get_activities(
+    #     foreign_id_times: [
+    #       { foreign_id: 'post:1000', time: '2016-11-10T13:20:00.000000' },
+    #       { foreign_id: 'like:2000', time: '2018-01-07T09:15:59.123456' }
+    #     ]
+    #   )
     #
     def get_activities(params = {})
       if params[:foreign_id_times]
         foreign_ids = []
         timestamps = []
-        params[:foreign_id_times].each{|e|
+        params[:foreign_id_times].each do |e|
           foreign_ids << e[:foreign_id]
           timestamps << e[:time]
-        }
+        end
         params = {
           foreign_ids: foreign_ids,
-          timestamps: timestamps,
+          timestamps: timestamps
         }
       end
       signature = Stream::Signer.create_jwt_token('activities', '*', @api_secret, '*')
@@ -43,42 +41,108 @@ module Stream
     end
 
     #
-    # Partial update activity, via foreign ID or Foreign ID + timestamp
+    # Partial update activity, via activity ID or Foreign ID + timestamp
     #
     # @param [Hash<:id, :foreign_id, :time, :set, :unset>] data the request params (id and foreign_id+timestamp mutually exclusive)
     #
     # @return the updated activity.
     #
-    # @example
-    #
-    # @client.activity_partial_update(
-    #   id: "4b39fda2-d6e2-42c9-9abf-5301ef071b12",
-    #   set: {
-    #    "product.price.eur": 12.99,
-    #    "colors": {
-    #      "blue": "#0000ff",
-    #      "green": "#00ff00",
-    #    }
-    #   },
-    #   unset: [ "popularity", "size.xl" ]
-    # )
-    #
-    # @client.activity_partial_update(
-    #   foreign_id: 'product:123',
-    #   time: '2016-11-10T13:20:00.000000',
-    #   set: {
-    #    "product.price.eur": 12.99,
-    #    "colors": {
-    #      "blue": "#0000ff",
-    #      "green": "#00ff00",
-    #    }
-    #   },
-    #   unset: [ "popularity", "size.xl" ]
-    # )
+    # @example Identify using activity ID
+    #   @client.activity_partial_update(
+    #     id: "4b39fda2-d6e2-42c9-9abf-5301ef071b12",
+    #     set: {
+    #       "product.price.eur": 12.99,
+    #       "colors": {
+    #         "blue": "#0000ff",
+    #         "green": "#00ff00",
+    #       }
+    #     },
+    #     unset: [ "popularity", "size.xl" ]
+    #   )
+    #
+    # @example Identify using Foreign ID + timestamp
+    #   @client.activity_partial_update(
+    #     foreign_id: 'product:123',
+    #     time: '2016-11-10T13:20:00.000000',
+    #     set: {
+    #      "product.price.eur": 12.99,
+    #      "colors": {
+    #        "blue": "#0000ff",
+    #        "green": "#00ff00",
+    #      }
+    #     },
+    #     unset: [ "popularity", "size.xl" ]
+    #   )
+    #
     def activity_partial_update(data = {})
       signature = Stream::Signer.create_jwt_token('activities', '*', @api_secret, '*')
       make_request(:post, '/activity/', signature, {}, data)
     end
 
+    #
+    # Batch partial activity update
+    #
+    # @param [Array< Hash<:id, :foreign_id, :time, :set, :unset> >] changes the list of changes to be applied
+    #
+    # @return the updated activities
+    #
+    # @example Identify using activity IDs
+    #   @client.batch_activity_partial_update([
+    #     {
+    #       id: "4b39fda2-d6e2-42c9-9abf-5301ef071b12",
+    #       set: {
+    #         "product.price.eur": 12.99,
+    #         "colors": {
+    #           "blue": "#0000ff",
+    #           "green": "#00ff00",
+    #         }
+    #       },
+    #       unset: [ "popularity", "size.x2" ]
+    #     },
+    #     {
+    #       id: "8d2dcad8-1e34-11e9-8b10-9cb6d0925edd",
+    #       set: {
+    #         "product.price.eur": 17.99,
+    #         "colors": {
+    #           "red": "#ff0000",
+    #           "green": "#00ff00",
+    #         }
+    #       },
+    #       unset: [ "rating" ]
+    #     }
+    #   ])
+    #
+    # @example Identify using Foreign IDs + timestamps
+    #   @client.batch_activity_partial_update([
+    #     {
+    #       foreign_id: "product:123",
+    #       time: '2016-11-10T13:20:00.000000',
+    #       set: {
+    #         "product.price.eur": 22.99,
+    #         "colors": {
+    #           "blue": "#0000ff",
+    #           "green": "#00ff00",
+    #         }
+    #       },
+    #       unset: [ "popularity", "size.x2" ]
+    #     },
+    #     {
+    #       foreign_id: "product:1234",
+    #       time: '2017-11-10T13:20:00.000000',
+    #       set: {
+    #         "product.price.eur": 37.99,
+    #         "colors": {
+    #           "black": "#000000",
+    #           "white": "#ffffff",
+    #         }
+    #       },
+    #       unset: [ "rating" ]
+    #     }
+    #   ])
+    #
+    def batch_activity_partial_update(changes = [])
+      signature = Stream::Signer.create_jwt_token('activities', '*', @api_secret, '*')
+      make_request(:post, '/activity/', signature, {}, { changes: changes })
+    end
   end
 end

data/lib/stream/batch.rb

@@ -8,20 +8,17 @@ module Stream
     # @return [nil]
     #
     # @example
-    #
-    #
-    # follows = [
-    #   {:source => 'flat:1', :target => 'user:1'},
-    #   {:source => 'flat:1', :target => 'user:3'}
-    # ]
-    # @client.follow_many(follows)
+    #   follows = [
+    #     {:source => 'flat:1', :target => 'user:1'},
+    #     {:source => 'flat:1', :target => 'user:3'}
+    #   ]
+    #   @client.follow_many(follows)
     #
     def follow_many(follows, activity_copy_limit = nil)
       query_params = {}
-      unless activity_copy_limit.nil?
-        query_params['activity_copy_limit'] = activity_copy_limit
-      end
-      make_signed_request(:post, '/follow_many/', query_params, follows)
+      query_params['activity_copy_limit'] = activity_copy_limit unless activity_copy_limit.nil?
+      signature = Stream::Signer.create_jwt_token('follower', '*', @api_secret, '*')
+      make_request(:post, '/follow_many/', signature, query_params, follows)
     end
 
     #
@@ -32,18 +29,17 @@ module Stream
     # return [nil]
     #
     # @example
-    #
-    #
-    # unfollows = [
-    #   {source: 'user:1', target: 'timeline:1'},
-    #   {source: 'user:2', target: 'timeline:2', keep_history: false}
-    # ]
-    # @client.unfollow_many(unfollows)
+    #   unfollows = [
+    #     {source: 'user:1', target: 'timeline:1'},
+    #     {source: 'user:2', target: 'timeline:2', keep_history: false}
+    #   ]
+    #   @client.unfollow_many(unfollows)
     #
     def unfollow_many(unfollows)
-      make_signed_request(:post, '/unfollow_many/', {}, unfollows)
+      signature = Stream::Signer.create_jwt_token('follower', '*', @api_secret, '*')
+      make_request(:post, '/unfollow_many/', signature, {}, unfollows)
     end
-    
+
     #
     # Adds an activity to many feeds in one single request
     #
@@ -54,10 +50,11 @@ module Stream
     #
     def add_to_many(activity_data, feeds)
       data = {
-        :feeds => feeds,
-        :activity => activity_data
+        feeds: feeds,
+        activity: activity_data
       }
-      make_signed_request(:post, '/feed/add_to_many/', {}, data)
+      signature = Stream::Signer.create_jwt_token('feed', '*', @api_secret, '*')
+      make_request(:post, '/feed/add_to_many/', signature, {}, data)
     end
   end
 end

data/lib/stream/client.rb

@@ -5,8 +5,8 @@ require 'stream/signer'
 require 'stream/url'
 
 module Stream
-  STREAM_URL_COM_RE = %r{https\:\/\/(?<key>\w+)\:(?<secret>\w+)@((api\.)|((?<location>[-\w]+)\.))?(?<api_hostname>stream-io-api\.com)\/[\w=-\?%&]+app_id=(?<app_id>\d+)}i
-  STREAM_URL_IO_RE = %r{https\:\/\/(?<key>\w+)\:(?<secret>\w+)@((api\.)|((?<location>[-\w]+)\.))?(?<api_hostname>getstream\.io)\/[\w=-\?%&]+app_id=(?<app_id>\d+)}i
+  STREAM_URL_COM_RE = %r{https://(?<key>\w+):(?<secret>\w+)@((api\.)|((?<location>[-\w]+)\.))?(?<api_hostname>stream-io-api\.com)/[\w=-?%&]+app_id=(?<app_id>\d+)}i.freeze
+  STREAM_URL_IO_RE = %r{https://(?<key>\w+):(?<secret>\w+)@((api\.)|((?<location>[-\w]+)\.))?(?<api_hostname>getstream\.io)/[\w=-?%&]+app_id=(?<app_id>\d+)}i.freeze
 
   class Client
     attr_reader :api_key
@@ -14,17 +14,15 @@ module Stream
     attr_reader :app_id
     attr_reader :client_options
 
-    if RUBY_VERSION.to_f >= 2.1
-      require 'stream/batch'
-      require 'stream/signedrequest'
-      require 'stream/personalization'
-      require 'stream/collections'
-      require 'stream/activities'
+    require 'stream/batch'
+    require 'stream/personalization'
+    require 'stream/collections'
+    require 'stream/activities'
+    require 'stream/reactions'
+    require 'stream/users'
 
-      include Stream::SignedRequest
-      include Stream::Batch
-      include Stream::Activities
-    end
+    include Stream::Batch
+    include Stream::Activities
 
     #
     # initializes a Stream API Client
@@ -46,7 +44,7 @@ module Stream
           re = Stream::STREAM_URL_IO_RE
         end
         raise ArgumentError, 'empty api_key parameter and missing or invalid STREAM_URL env variable' unless re
-        
+
         matches = re.match(ENV['STREAM_URL'])
         api_key = matches['key']
         api_secret = matches['secret']
@@ -77,8 +75,31 @@ module Stream
     # @return [Stream::Feed]
     #
     def feed(feed_slug, user_id)
-      token = @signer.sign(feed_slug, user_id)
-      Stream::Feed.new(self, feed_slug, user_id, token)
+      Stream::Feed.new(self, feed_slug, user_id)
+    end
+
+    # Creates a user token
+    #
+    # @deprecated Use Client#create_user_token instead
+    #
+    # @param [string] user_id the user_if of this token (e.g. User42)
+    # @param [hash] extra_data additional token data
+    #
+    # @return [string]
+    #
+    def create_user_session_token(user_id, extra_data = {})
+      create_user_token(user_id, extra_data)
+    end
+
+    # Creates a user token
+    #
+    # @param [string] user_id the user_if of this token (e.g. User42)
+    # @param [hash] extra_data additional token data
+    #
+    # @return [string]
+    #
+    def create_user_token(user_id, extra_data = {})
+      Stream::Signer.create_user_token(user_id, extra_data, api_secret)
     end
 
     def personalization
@@ -89,6 +110,14 @@ module Stream
       CollectionsClient.new(api_key, api_secret, app_id, client_options)
     end
 
+    def reactions
+      ReactionsClient.new(api_key, api_secret, app_id, client_options)
+    end
+
+    def users
+      UsersClient.new(api_key, api_secret, app_id, client_options)
+    end
+
     def update_activity(activity)
       update_activities([activity])
     end
@@ -98,22 +127,26 @@ module Stream
       make_request(:post, '/activities/', auth_token, {}, 'activities' => activities)
     end
 
+    def og(uri)
+      auth_token = Stream::Signer.create_jwt_token('*', '*', @api_secret, '*')
+      make_request(:get, '/og', auth_token, { url: uri })
+    end
+
     def get_default_params
-      {:api_key => @api_key}
+      { api_key: @api_key }
     end
 
     def get_http_client
-      @http_client ||= StreamHTTPClient.new(url_generator)
+      @get_http_client ||= StreamHTTPClient.new(url_generator)
     end
 
     def make_query_params(params)
-      Hash[get_default_params.merge(params).sort_by {|k, v| k.to_s}]
+      Hash[get_default_params.merge(params).sort_by { |k, _v| k.to_s }]
     end
 
     def make_request(method, relative_url, signature, params = {}, data = {}, headers = {})
       headers['Authorization'] = signature
       headers['stream-auth-type'] = 'jwt'
-
       get_http_client.make_http_request(method, relative_url, make_query_params(params), data, headers)
     end
 
@@ -158,7 +191,7 @@ module Stream
 
       case response[:status].to_i
       when 200..203
-        return ::JSON.parse(response[:body])
+        ::JSON.parse(response[:body])
       end
     end
   end
@@ -167,16 +200,16 @@ module Stream
     def call(env)
       @app.call(env).on_complete do |response|
         case response[:status].to_i
-          when 200..203
-            return response
-          when 401
-            raise StreamApiResponseException, error_message(response, 'Bad feed')
-          when 403
-            raise StreamApiResponseException, error_message(response, 'Bad auth/headers')
-          when 404
-            raise StreamApiResponseException, error_message(response, 'url not found')
-          when 204...600
-            raise StreamApiResponseException, error_message(response, _build_error_message(response.body))
+        when 200..203
+          return response
+        when 401
+          raise StreamApiResponseException, error_message(response, 'Bad feed')
+        when 403
+          raise StreamApiResponseException, error_message(response, 'Bad auth/headers')
+        when 404
+          raise StreamApiResponseException, error_message(response, 'url not found')
+        when 204...600
+          raise StreamApiResponseException, error_message(response, _build_error_message(response.body))
         end
       end
     end
@@ -200,7 +233,7 @@ module Stream
     end
 
     def error_message(response, body = nil)
-      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{["#{response[:status]}:", body].compact.join(' ')}"
     end
   end
 end

data/lib/stream/collections.rb

@@ -1,5 +1,33 @@
 module Stream
   class CollectionsClient < Client
+    def add(collection_name, collection_data, id: nil, user_id: nil)
+      data = {
+        id: id,
+        user_id: user_id,
+        data: collection_data
+      }
+      uri = "/collections/#{collection_name}/"
+      make_collection_request(:post, {}, data, endpoint: uri)
+    end
+
+    def get(collection_name, id)
+      uri = "collections/#{collection_name}/#{id}/"
+      make_collection_request(:get, {}, {}, endpoint: uri)
+    end
+
+    def update(collection_name, id, data: nil)
+      data = {
+        data: data
+      }
+      uri = "collections/#{collection_name}/#{id}/"
+      make_collection_request(:put, {}, data, endpoint: uri)
+    end
+
+    def delete(collection_name, id)
+      uri = "collections/#{collection_name}/#{id}/"
+      make_collection_request(:delete, {}, {}, endpoint: uri)
+    end
+
     def upsert(collection, objects = [])
       data = {
         data: {
@@ -9,14 +37,14 @@ module Stream
       make_collection_request(:post, {}, data)
     end
 
-    def get(collection, ids = [])
+    def select(collection, ids = [])
       params = {
         foreign_ids: ids.map { |id| "#{collection}:#{id}" }.join(',')
       }
       make_collection_request(:get, params, {})
     end
 
-    def delete(collection, ids = [])
+    def delete_many(collection, ids = [])
       params = {
         collection_name: collection,
         ids: ids.join(',')
@@ -25,17 +53,14 @@ module Stream
     end
 
     def create_reference(collection, id)
-      "SO:#{collection}:#{id}"
-    end
-
-    def create_user_reference(id)
-      create_reference('user', id)
+      k = id
+      k = id['id'] if id.respond_to?(:keys) && !id['id'].nil?
+      "SO:#{collection}:#{k}"
     end
 
     private
 
-    def make_collection_request(method, params, data)
-      endpoint = '/meta/'
+    def make_collection_request(method, params, data, endpoint: '/collections/')
       auth_token = Stream::Signer.create_jwt_token('collections', '*', @api_secret, '*', '*')
       make_request(method, endpoint, auth_token, params, data)
     end

data/lib/stream/feed.rb

@@ -6,16 +6,11 @@ module Stream
     attr_reader :id
     attr_reader :slug
     attr_reader :user_id
-    attr_reader :token
 
-    def initialize(client, feed_slug, user_id, token)
-      unless valid_feed_slug feed_slug
-        raise StreamInputData, 'feed_slug can only contain alphanumeric characters plus underscores'
-      end
+    def initialize(client, feed_slug, user_id)
+      raise StreamInputData, 'feed_slug can only contain alphanumeric characters plus underscores' unless valid_feed_slug feed_slug
 
-      unless valid_user_id user_id
-        raise StreamInputData, 'user_id can only contain alphanumeric characters plus underscores and dashes'
-      end
+      raise StreamInputData, 'user_id can only contain alphanumeric characters plus underscores and dashes' unless valid_user_id user_id
 
       @id = "#{feed_slug}:#{user_id}"
       @client = client
@@ -23,7 +18,6 @@ module Stream
       @slug = feed_slug
       @feed_name = "#{feed_slug}#{user_id}"
       @feed_url = "#{feed_slug}/#{user_id}"
-      @token = token
     end
 
     def readonly_token
@@ -39,30 +33,27 @@ module Stream
     end
 
     def get(params = {})
-      uri = "/feed/#{@feed_url}/"
-      if params[:mark_read] && params[:mark_read].is_a?(Array)
-        params[:mark_read] = params[:mark_read].join(',')
-      end
-      if params[:mark_seen] && params[:mark_seen].is_a?(Array)
-        params[:mark_seen] = params[:mark_seen].join(',')
+      uri = if params[:enrich] || params[:reactions]
+              "/enrich/feed/#{@feed_url}/"
+            else
+              "/feed/#{@feed_url}/"
+            end
+      params[:mark_read] = params[:mark_read].join(',') if params[:mark_read]&.is_a?(Array)
+      params[:mark_seen] = params[:mark_seen].join(',') if params[:mark_seen]&.is_a?(Array)
+      if params[:reactions].respond_to?(:keys)
+        params[:withOwnReactions] = true if params[:reactions][:own]
+        params[:withRecentReactions] = true if params[:reactions][:recent]
+        params[:withReactionCounts] = true if params[:reactions][:counts]
       end
-      auth_token = create_jwt_token('feed', 'read')
+      %i[enrich reactions].each { |k| params.delete(k) }
 
+      auth_token = create_jwt_token('feed', 'read')
       @client.make_request(:get, uri, auth_token, params)
     end
 
-    def sign_to_field(to)
-      to.map do |feed_id|
-        feed_slug, user_id = feed_id.split(':')
-        feed = @client.feed(feed_slug, user_id)
-        "#{feed.id} #{feed.token}"
-      end
-    end
-
     def add_activity(activity_data)
       uri = "/feed/#{@feed_url}/"
       data = activity_data.clone
-      data[:to] &&= sign_to_field(data[:to])
       auth_token = create_jwt_token('feed', 'write')
 
       @client.make_request(:post, uri, auth_token, {}, data)
@@ -70,23 +61,20 @@ module Stream
 
     def add_activities(activities)
       uri = "/feed/#{@feed_url}/"
-      activities.each do |activity|
-        activity[:to] &&= sign_to_field(activity[:to])
-      end
-      data = {:activities => activities}
+      data = { activities: activities }
       auth_token = create_jwt_token('feed', 'write')
 
       @client.make_request(:post, uri, auth_token, {}, data)
     end
 
-    def remove(activity_id, foreign_id = false)
+    def remove(activity_id, foreign_id: false)
       remove_activity(activity_id, foreign_id)
     end
 
-    def remove_activity(activity_id, foreign_id = false)
+    def remove_activity(activity_id, foreign_id: false)
       uri = "/feed/#{@feed_url}/#{activity_id}/"
       params = {}
-      params = {foreign_id: 1} if foreign_id
+      params = { foreign_id: 1 } if foreign_id
       auth_token = create_jwt_token('feed', 'delete')
 
       @client.make_request(:delete, uri, auth_token, params)
@@ -102,15 +90,29 @@ module Stream
       @client.make_request(:post, '/activities/', auth_token, {}, 'activities' => activities)
     end
 
+    def update_activity_to_targets(foreign_id, time, new_targets: nil, added_targets: nil, removed_targets: nil)
+      uri = "/feed_targets/#{@feed_url}/activity_to_targets/"
+      data = {
+        'foreign_id': foreign_id,
+        'time': time
+      }
+
+      data['new_targets'] = new_targets unless new_targets.nil?
+      data['added_targets'] = added_targets unless added_targets.nil?
+      data['removed_targets'] = removed_targets unless removed_targets.nil?
+      auth_token = create_jwt_token('feed_targets', 'write')
+
+      @client.make_request(:post, uri, auth_token, {}, data)
+    end
+
     def follow(target_feed_slug, target_user_id, activity_copy_limit = 300)
       uri = "/feed/#{@feed_url}/follows/"
-      activity_copy_limit = 0 if activity_copy_limit < 0
+      activity_copy_limit = 0 if activity_copy_limit.negative?
       activity_copy_limit = 1000 if activity_copy_limit > 1000
 
       follow_data = {
-          target: "#{target_feed_slug}:#{target_user_id}",
-          target_token: @client.feed(target_feed_slug, target_user_id).token,
-          activity_copy_limit: activity_copy_limit
+        target: "#{target_feed_slug}:#{target_user_id}",
+        activity_copy_limit: activity_copy_limit
       }
       auth_token = create_jwt_token('follower', 'write')
 
@@ -120,8 +122,8 @@ module Stream
     def followers(offset = 0, limit = 25)
       uri = "/feed/#{@feed_url}/followers/"
       params = {
-          offset: offset,
-          limit: limit
+        offset: offset,
+        limit: limit
       }
       auth_token = create_jwt_token('follower', 'read')
 
@@ -131,16 +133,16 @@ module Stream
     def following(offset = 0, limit = 25, filter = [])
       uri = "/feed/#{@feed_url}/follows/"
       params = {
-          offset: offset,
-          limit: limit,
-          filter: filter.join(',')
+        offset: offset,
+        limit: limit,
+        filter: filter.join(',')
       }
       auth_token = create_jwt_token('follower', 'read')
 
       @client.make_request(:get, uri, auth_token, params)
     end
 
-    def unfollow(target_feed_slug, target_user_id, keep_history = false)
+    def unfollow(target_feed_slug, target_user_id, keep_history: false)
       uri = "/feed/#{@feed_url}/follows/#{target_feed_slug}:#{target_user_id}/"
       auth_token = create_jwt_token('follower', 'delete')
       params = {}

data/lib/stream/reactions.rb

@@ -0,0 +1,80 @@
+module Stream
+  class ReactionsClient < Client
+    def add(kind, activity_id, user_id, data: nil, target_feeds: nil)
+      data = {
+        kind: kind,
+        activity_id: activity_id,
+        user_id: user_id,
+        data: data,
+        target_feeds: target_feeds
+      }
+      make_reaction_request(:post, {}, data)
+    end
+
+    def get(reaction_id)
+      uri = "/reaction/#{reaction_id}/"
+      make_reaction_request(:get, {}, {}, endpoint: uri)
+    end
+
+    def update(reaction_id, data: nil, target_feeds: nil)
+      data = {
+        data: data,
+        target_feeds: target_feeds
+      }
+      uri = "/reaction/#{reaction_id}/"
+      make_reaction_request(:put, {}, data, endpoint: uri)
+    end
+
+    def delete(reaction_id)
+      uri = "/reaction/#{reaction_id}/"
+      make_reaction_request(:delete, {}, {}, endpoint: uri)
+    end
+
+    def add_child(kind, parent_id, user_id, data: nil, target_feeds: nil)
+      data = {
+        kind: kind,
+        parent: parent_id,
+        user_id: user_id,
+        data: data,
+        target_feeds: target_feeds
+      }
+      make_reaction_request(:post, {}, data)
+    end
+
+    def filter(params = {})
+      field = ''
+      value = ''
+      kind = params.fetch(:kind, '')
+      if params[:reaction_id]
+        field = 'reaction_id'
+        value = params[:reaction_id]
+      elsif params[:activity_id]
+        field = 'activity_id'
+        value = params[:activity_id]
+      elsif params[:user_id]
+        field = 'user_id'
+        value = params[:user_id]
+      end
+      params.delete(field.to_sym) unless field.empty?
+      uri = if kind.nil? || kind.empty?
+              "/reaction/#{field}/#{value}/"
+            else
+              "/reaction/#{field}/#{value}/#{kind}/"
+            end
+      make_reaction_request(:get, params, {}, endpoint: uri)
+    end
+
+    def create_reference(id)
+      k = id
+      k = id['id'] if id.respond_to?(:keys) && !id['id'].nil?
+      "SR:#{k}"
+    end
+
+    private
+
+    def make_reaction_request(method, params, data, endpoint: '/reaction/')
+      auth_token = Stream::Signer.create_jwt_token('reactions', '*', @api_secret, '*', '*')
+      make_request(method, endpoint, auth_token, params, data)
+    end
+  end
+end

data/lib/stream/signer.rb

@@ -7,27 +7,17 @@ module Stream
 
     def initialize(key)
       @key = key.to_s
-      @sha1 = OpenSSL::Digest.new('sha1')
     end
 
-    def urlsafe_encodeb64(value)
-      value.tr('+', '-').tr('/', '_').gsub(/^=+/, '').gsub(/=+$/, '')
-    end
-
-    def sign_message(message)
-      key = Digest::SHA1.digest @key.to_s
-      token = Base64.strict_encode64(OpenSSL::HMAC.digest(@sha1, key, message))
-      urlsafe_encodeb64(token)
-    end
-
-    def sign(feed_slug, user_id)
-      sign_message("#{feed_slug}#{user_id}")
+    def self.create_user_token(user_id, payload = {}, api_secret)
+      payload['user_id'] = user_id
+      JWT.encode(payload, api_secret, 'HS256')
     end
 
     def self.create_jwt_token(resource, action, api_secret, feed_id = nil, user_id = nil)
       payload = {
-          resource: resource,
-          action: action
+        resource: resource,
+        action: action
       }
       payload['feed_id'] = feed_id if feed_id
       payload['user_id'] = user_id if user_id

data/lib/stream/url.rb

@@ -7,10 +7,11 @@ module Stream
 
   class APIURLGenerator < URLGenerator
     def initialize(options)
+      super()
       @options = options
       location = make_location(options[:location])
-      location ||= "api"
-      api_version = options[:api_version] ? options[:api_version] : 'v1.0'
+      location ||= 'api'
+      api_version = options[:api_version] || 'v1.0'
       if ENV['STREAM_URL']
         uri = URI.parse(ENV['STREAM_URL'])
         scheme = uri.scheme
@@ -48,6 +49,7 @@ module Stream
 
   class PersonalizationURLGenerator < URLGenerator
     def initialize(options)
+      super()
       @options = options
       host = 'personalization.stream-io-api.com'
       @base_path = '/personalization/v1.0'

data/lib/stream/users.rb

@@ -0,0 +1,45 @@
+module Stream
+  class UsersClient < Client
+    def add(user_id, data: nil, get_or_create: false)
+      data = {
+        id: user_id,
+        data: data
+      }
+      params = {
+        get_or_create: get_or_create
+      }
+      make_user_request(:post, params, data)
+    end
+
+    def get(user_id)
+      uri = "/user/#{user_id}/"
+      make_user_request(:get, {}, {}, endpoint: uri)
+    end
+
+    def update(user_id, data: nil)
+      data = {
+        data: data
+      }
+      uri = "/user/#{user_id}/"
+      make_user_request(:put, {}, data, endpoint: uri)
+    end
+
+    def delete(user_id)
+      uri = "/user/#{user_id}/"
+      make_user_request(:delete, {}, {}, endpoint: uri)
+    end
+
+    def create_reference(id)
+      k = id
+      k = id['id'] if id.respond_to?(:keys) && !id['id'].nil?
+      "SU:#{k}"
+    end
+
+    private
+
+    def make_user_request(method, params, data, endpoint: '/user/')
+      auth_token = Stream::Signer.create_jwt_token('users', '*', @api_secret, '*', '*')
+      make_request(method, endpoint, auth_token, params, data)
+    end
+  end
+end

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = '2.10.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tommaso Barbugli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -32,20 +32,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: http_signatures
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -70,44 +56,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Ruby client for getstream.io service
 email: support@getstream.io
 executables: []
@@ -128,9 +114,10 @@ files:
 - lib/stream/exceptions.rb
 - lib/stream/feed.rb
 - lib/stream/personalization.rb
-- lib/stream/signedrequest.rb
+- lib/stream/reactions.rb
 - lib/stream/signer.rb
 - lib/stream/url.rb
+- lib/stream/users.rb
 - lib/stream/version.rb
 homepage: http://github.com/GetStream/stream-ruby
 licenses:
@@ -144,15 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A gem that provides a client interface for getstream.io

data/lib/stream/signedrequest.rb

@@ -1,43 +0,0 @@
-require 'http_signatures'
-require 'net/http'
-require 'time'
-
-module Stream
-  module SignedRequest
-    module ClassMethods
-      def supports_signed_requests;
-      end
-    end
-
-    def self.included(klass)
-      klass.extend ClassMethods
-    end
-
-    def make_signed_request(method, relative_url, params = {}, data = {})
-      query_params = make_query_params(params)
-      context = HttpSignatures::Context.new(
-          keys: {@api_key => @api_secret},
-          algorithm: 'hmac-sha256',
-          headers: %w(date)
-      )
-      method_map = {
-          :get => Net::HTTP::Get,
-          :delete => Net::HTTP::Delete,
-          :put => Net::HTTP::Put,
-          :post => Net::HTTP::Post
-      }
-      request_date = Time.now.rfc822
-      message = method_map[method].new(
-          "#{get_http_client.base_path}#{relative_url}?#{URI.encode_www_form(query_params)}",
-          'date' => request_date
-      )
-      context.signer.sign(message)
-      headers = {
-          Authorization: message['Signature'],
-          Date: request_date,
-          'X-Api-Key' => api_key
-      }
-      get_http_client.make_http_request(method, relative_url, query_params, data, headers)
-    end
-  end
-end