stream_rails 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e57fb207229b63d03d93d4ff6f96e783b0daa4
-  data.tar.gz: 548fcb9f24f5c7b4f64633945a23496931fd2fc0
+  metadata.gz: 6f45aa0e3dd69e72ed3690118dc9d3dd04c9921e
+  data.tar.gz: 2c535ef5107a6f56be191c679ad5bd86575bfd41
 SHA512:
-  metadata.gz: 333126bba376d6acf4ff7cac9403fb74f8a1ddb3bf151f365f37511eb1f5a2b6fca40f2ee13a2398223fa298250803c5afbb10f4d17c0651e7c1eb91c8168e7c
-  data.tar.gz: 6ecd2019ed9df6a4239771773f1db3a600d3f34a8cd1bef4d21c65520563e046c8593348d848718fb40a77a16b6028e47a47afa8a65f06905b331926ad3b93b7
+  metadata.gz: 7cdf88de17a7378f1c4c2d58fece46d5e71d61374784fc432081e6243fd2eacc4e24513b0f0fef55211693d271f641e1261ebb874206882960178ab48cdf98e1
+  data.tar.gz: a5c3638890a1af1b42f46c4edc59e3e26b8defa716c38d4123426de839e2e7600153ddde07cd54b2c413b4513fa0242d44ccd0cb8ca9b7b432893cea528dd8cc

data/README.md

@@ -61,6 +61,7 @@ require 'stream_rails'
 StreamRails.configure do |config|
   config.api_key     = "YOUR API KEY"
   config.api_secret  = "YOUR API SECRET"
+  config.timeout     = 30
 end
 ```
 
@@ -85,7 +86,7 @@ class Pin < ActiveRecord::Base
 
 end
 ```
-Everytime a Pin is created it will be stored in the feed of the user that created it, and when a Pin instance is deleted than it will get removed as well.
+Everytime a Pin is created it will be stored in the feed of the user that created it.  When a Pin instance is deleted, the feed will be removed as well.
 
 ####Activity fields
 
@@ -150,8 +151,8 @@ feed = StreamRails.feed_manager.get_user_feed(current_user.id)
 
 ####Feeds bundled with feed_manager
 
-To get you started the manager has 4 feeds pre configured. You can add more feeds if your application needs it.
-Feeds are divided in three categories.
+To get you started the manager has 4 feeds pre-configured. You can add more feeds if your application requires it.
+Feeds are divided into three categories.
 
 #####User feed:
 The user feed stores all activities for a user. Think of it as your personal Facebook page. You can easily get this feed from the manager.
@@ -160,7 +161,7 @@ feed = StreamRails.feed_manager.get_user_feed(current_user.id)
 ```
 
 #####News feeds:
-The news feeds store the activities from the people you follow.
+News feeds store activities from the people you follow.
 There is both a flat newsfeed (similar to twitter) and an aggregated newsfeed (like facebook).
 
 ```php
@@ -226,7 +227,7 @@ end
 ```
 
 ####Follow a feed
-The create the newsfeeds you need to notify the system about follow relationships. The manager comes with APIs to let a user's news feeds follow another user's feed. This code lets the current user's flat and aggregated feeds follow the target_user's personal feed.
+This is how you create the newsfeeds you need to notify the system about follow relationships. The manager comes with APIs to let a user's news feed follow another user's feed. This code lets the current user's flat and aggregated feeds follow the target_user's personal feed.
 
 ```
 StreamRails.feed_manager.follow_user(user_id, target_id)
@@ -255,7 +256,7 @@ activities = enricher.enrich_activities(results)
 ####Templating
 
 Now that you've enriched the activities you can render them in a view.
-For convenience we includes a basic view:
+For convenience we include a basic view:
 
 ```
 <div class="container">

data/lib/stream_rails/config.rb

@@ -6,6 +6,7 @@ module StreamRails
     attr_accessor :location
     attr_accessor :api_site_id
     attr_accessor :enabled
+    attr_accessor :timeout
     
     attr_accessor :news_feeds
     attr_accessor :notification_feed
@@ -16,6 +17,7 @@ module StreamRails
       @news_feeds = {:flat=>'flat', :aggregated=>'aggregated'}
       @notification_feed  = 'notification'
       @user_feed  = 'user'
+      @timeout = 3
     end
 
     def feed_configs

data/lib/stream_rails/version.rb

@@ -1,3 +1,3 @@
 module StreamRails
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

data/lib/stream_rails.rb

@@ -18,7 +18,8 @@ module StreamRails
       self.config.api_key,
       self.config.api_secret,
       self.config.api_site_id,
-      :location => self.config.location
+      :location => self.config.location,
+      :default_timeout => self.config.timeout
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stream_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Tommaso Barbugli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack