stream-ruby 2.2.5 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dcbc7443fc76e9b0b31e82a6651ff5d9abbebea
-  data.tar.gz: d404852e9f6a1b824cdd732ca47408f654952882
+  metadata.gz: 56cc18197a65ac7e4850c3b26d4074ab05a388e0
+  data.tar.gz: 79bcf52439076f18713845f218a620b5193acf77
 SHA512:
-  metadata.gz: 37e2499bc9049c54d2c85eb3ee1828b6444a37b135aaa616821c87cd734ee1c11a6f8236d049aaac70148e59b3f254bc603966ed845a1fa672f21daca977bc93
-  data.tar.gz: f9abb7ebb07dc01adf09e1b2cd650282d2ce00c062b7f23c576f3c7dfb9862838092bb5300cc569d338962a44d301d96ad3b199ab992afaa779369f1f1fa3d2c
+  metadata.gz: 9db451f0039402f2b4f9bd2cab4d84e37cf826051b89a6b98de0728f1f8966cee48a180305a0ce3768e0ed8ffd23c80effb20e6aa2d3fb685c41a97140c12619
+  data.tar.gz: fb99db9538f8a0445aee5fbcc53c5fda9936649644273a87f02aab397276ea78010aeafa84f1cdd1724ffcabbb5ca35df3ca849edb4135ad140a8e8427ce0376

data/README.md

@@ -17,7 +17,7 @@ gem install "stream-ruby"
 ```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', :location => 'us-east')
 # Find your API keys here https://getstream.io/dashboard/
 
 # Instantiate a feed object
@@ -79,10 +79,10 @@ user_feed_1.add_activity(data)
 user_feed_1.delete
 
 # Generating tokens for client side usage
-token = user_feed_1.token
+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)

data/lib/stream/batch.rb

@@ -16,8 +16,12 @@ module Stream
     # ]
     # @client.follow_many(follows)
     #
-    def follow_many(follows)
-      make_signed_request(:post, "/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)
     end
 
     #

data/lib/stream/client.rb

@@ -82,6 +82,8 @@ module Stream
 
     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
   end

data/lib/stream/feed.rb

@@ -1,4 +1,5 @@
 require "stream/signer"
+require "jwt"
 
 module Stream
   class Feed
@@ -6,7 +7,6 @@ module Stream
     attr_reader :slug
     attr_reader :user_id
     attr_reader :token
-    attr_reader :signature
 
     def initialize(client, feed_slug, user_id, token)
       unless valid_feed_slug feed_slug
@@ -21,9 +21,13 @@ module Stream
       @client = client
       @user_id = user_id
       @slug = feed_slug
+      @feed_name = "#{feed_slug}#{user_id}"
       @feed_url = "#{feed_slug}/#{user_id}"
       @token = token
-      @signature = "#{feed_slug}#{user_id} #{token}"
+    end
+
+    def readonly_token
+      create_jwt_token("*", "read")
     end
 
     def valid_feed_slug(feed_slug)
@@ -42,7 +46,9 @@ module Stream
       if params[:mark_seen] && params[:mark_seen].is_a?(Array)
         params[:mark_seen] = params[:mark_seen].join(",")
       end
-      @client.make_request(:get, uri, @signature, params)
+      auth_token = create_jwt_token("feed", "read")
+
+      @client.make_request(:get, uri, auth_token, params)
     end
 
     def sign_to_field(to)
@@ -56,7 +62,9 @@ module Stream
     def add_activity(activity_data)
       uri = "/feed/#{@feed_url}/"
       activity_data[:to] &&= sign_to_field(activity_data[:to])
-      @client.make_request(:post, uri, @signature, {}, activity_data)
+      auth_token = create_jwt_token("feed", "write")
+
+      @client.make_request(:post, uri, auth_token, {}, activity_data)
     end
 
     def add_activities(activities)
@@ -65,7 +73,9 @@ module Stream
         activity[:to] &&= sign_to_field(activity[:to])
       end
       data = { :activities => activities }
-      @client.make_request(:post, uri, @signature, {}, data)
+      auth_token = create_jwt_token("feed", "write")
+
+      @client.make_request(:post, uri, auth_token, {}, data)
     end
 
     def remove(activity_id, foreign_id = false)
@@ -76,12 +86,16 @@ module Stream
       uri = "/feed/#{@feed_url}/#{activity_id}/"
       params = {}
       params = { "foreign_id" => 1 } if foreign_id
-      @client.make_request(:delete, uri, @signature, params)
+      auth_token = create_jwt_token("feed", "delete")
+
+      @client.make_request(:delete, uri, auth_token, {}, params)
     end
 
     def delete
       uri = "/feed/#{@feed_url}/"
-      @client.make_request(:delete, uri, @signature)
+      auth_token = create_jwt_token("feed", "delete")
+
+      @client.make_request(:delete, uri, auth_token)
     end
 
     def follow(target_feed_slug, target_user_id)
@@ -90,7 +104,9 @@ module Stream
         :target => "#{target_feed_slug}:#{target_user_id}",
         :target_token => @client.feed(target_feed_slug, target_user_id).token
       }
-      @client.make_request(:post, uri, @signature, {}, follow_data)
+      auth_token = create_jwt_token("follower", "write")
+
+      @client.make_request(:post, uri, auth_token, {}, follow_data)
     end
 
     def followers(offset = 0, limit = 25)
@@ -99,7 +115,9 @@ module Stream
         "offset" => offset,
         "limit" => limit
       }
-      @client.make_request(:get, uri, @signature, params)
+      auth_token = create_jwt_token("follower", "read")
+
+      @client.make_request(:get, uri, auth_token, {}, params)
     end
 
     def following(offset = 0, limit = 25, filter = [])
@@ -109,12 +127,30 @@ module Stream
         "limit" => limit,
         "filter" => filter.join(",")
       }
-      @client.make_request(:get, uri, @signature, params)
+      auth_token = create_jwt_token("follower", "read")
+
+      @client.make_request(:get, uri, auth_token, {}, params)
     end
 
     def unfollow(target_feed_slug, target_user_id)
       uri = "/feed/#{@feed_url}/follows/#{target_feed_slug}:#{target_user_id}/"
-      @client.make_request(:delete, uri, @signature)
+      auth_token = create_jwt_token("follower", "delete")
+
+      @client.make_request(:delete, uri, auth_token, {auth_token: auth_token})
+    end
+
+    private
+
+    def create_jwt_token(resource, action, feed_id=nil, user_id=nil)
+      payload = {
+        "resource" => resource,
+        "action" => action,
+        "feed_id" => @feed_name
+      }
+      payload["feed_id"] = feed_id if feed_id
+      payload["user_id"] = user_id if user_id
+
+      return JWT.encode(payload, @client.api_secret, 'HS256')
     end
   end
 end

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = "2.2.5"
+  VERSION = "2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: '2.3'
 platform: ruby
 authors:
 - Tommaso Barbugli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement