stream-ruby 0.8.2 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmY4YWIxMmZmODEyYWViYjViMDU3ZmVlMTgxZjZmNzRjNDIwNWNiMw==
+    OThkZjY2OWMwNDJkNzQ1YzlhYjBjNGFkYzc0ZGI0MWQwZDk4Y2U3YQ==
   data.tar.gz: !binary |-
-    YjM1MjM3MzMxZDA5ODg3MDdmNmE5ZjRlYTFlYTIyZTZlZjRiYzE5Yg==
+    YjlhMDk3NmUyODE3OTM5YjFmYTQ3YTYwYThiNGRmMzAzODFhNDNkNA==
 SHA512:
   metadata.gz: !binary |-
-    YjY2YmFlNGY1ZjE0MTQ2MGVjZThlNTUyYzk1NTkwZTY1NmI4NDkwNDcwYzcw
-    MmZjYWZkNjYzMzg1Zjk1NWRmNzQ1OTJlYWUzZmRmN2YyY2NjZDFmZjA0MmJi
-    NDc2MjU0NjNjMDZmNDJmMDMxMGIwYjM4MjUyZmQyZTA2ZWYxYzY=
+    YTUzY2NhNmUyNTc0YmRjNTVkZWI1YjlkNDc3ZTEzYjM1ZTIzNDIzYjVmMWNh
+    OWU5YTliZThjZGVmZjQzZmExNmY0ODdmZjc3YTAxYTI2NTVjYTM4M2RmNmM4
+    YzRlMTQxOTMzM2FiYWRhYjVlOGIyYjZkNTZkODRiZTI1NjU4MTc=
   data.tar.gz: !binary |-
-    ZjNlYzNmODc5Mjg0OGJiN2U2MmQ1MjA4M2M0NjhlMzk1ZDM3M2JjODUwODk0
-    MTZhY2EwMGQ2NDQxYzkzNGM0ZmM1ZDkzMjJhYTIyYWU3NjY3OTFjMmU3ZmNh
-    MmViMjA4N2NmNDE2MjJjM2ZmZDhiMDEzZTI5MDIyNjQwMDRhM2E=
+    MDdlMGM1MmI5ZmJlZTlhMjc1M2EzYzU5NTFlNzEyNWU5MTJiMDU3MjE5ZjUx
+    NmI0NDBlOGI2NDdlMjA3MTlkYmFjZTY3Y2VjMjgxMDY4M2U2MjU3ZWVkOGVh
+    ZjlkNTUwNDUyMmQ1NzYyYWUwNjhlMTJjODhlMWQ5YTFjNDJlNGU=

data/README.md

@@ -29,6 +29,13 @@ result = user_feed_1.get(:limit=>5, :id_lt=>'e561de8f-00f1-11e4-b400-0cc47a024be
 # Create a new activity
 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_response = user_feed_1.add_activity(activity_data)
 
 # Remove an activity by its id
 user_feed_1.remove('e561de8f-00f1-11e4-b400-0cc47a024be0')
@@ -68,19 +75,19 @@ token = user_feed_1.token
 # user1 = client.feed('user:1', '{{ token }}');
 
 # Retrieve first 10 followers of a feed
-user_feed_1.followers(limit=10);
+user_feed_1.followers(0, 10);
 
 # Retrieve followers from 10 to 20
-user_feed_1.followers(limit=10, offset=10);
+user_feed_1.followers(10, 10);
 
 # Retrieve 10 feeds followed by user_feed_1
-user_feed_1.following(limit=10);
+user_feed_1.following(10);
 
 # Retrieve 10 feeds followed by user_feed_1 starting from the 11th
-user_feed_1.following(limit=10, offset=10);
+user_feed_1.following(10, 10);
 
 # Check if user_feed_1 follows specific feeds
-user_feed_1.following(limit=2, offset=0, filter=['user:42', 'user:43']);
+user_feed_1.following(0, 2, filter=['user:42', 'user:43']);
 
 ```
 

data/lib/stream/client.rb

@@ -2,21 +2,26 @@ require 'stream/signer'
 require 'stream/feed'
 
 module Stream
+    STREAM_URL_RE = /https\:\/\/(?<key>\w+)\:(?<secret>\w+).*site=(?<site>\d+)/i
+
     class Client
         attr_reader :api_key
         attr_reader :api_secret
         attr_reader :site
 
         def initialize(api_key='', api_secret='', site=0)
-            # Support the Heroku STREAM_URL environment variable
             
-            if ENV['STREAM_URL'] != nil and api_key == ''
-                matches = /https\:\/\/(?<key>\w+)\:(?<secret>\w+).*site=(?<site>\d+)/i.match(ENV['STREAM_URL'])
+            if ENV['STREAM_URL'] =~ Stream::STREAM_URL_RE and api_key == ''
+                matches = Stream::STREAM_URL_RE.match(ENV['STREAM_URL'])
                 api_key = matches['key']
                 api_secret = matches['secret']
                 site = matches['site']
             end
-          
+
+            if api_key == ''
+                raise ArgumentError, 'empty api_key parameter and missing or invalid STREAM_URL env variable'
+            end
+
             @api_key = api_key
             @api_secret = api_secret
             @site = site

data/lib/stream/feed.rb

@@ -58,6 +58,9 @@ module Stream
 
         def get(params = {})
             uri = "/feed/#{@feed_url}/"
+            if params[:mark_read]
+                params[:mark_read] = params[:mark_read].join(",")
+            end
             self.make_request(:get, uri, params)
         end
 
@@ -111,7 +114,7 @@ module Stream
             self.make_request(:post, uri, nil, follow_data)
         end
 
-        def followers(limit=25, offset=0)
+        def followers(offset=0, limit=25)
             uri = "/feed/#{@feed_url}/followers/"
             params = {
                 'offset' => offset,
@@ -120,7 +123,7 @@ module Stream
             self.make_request(:get, uri, params)
         end
 
-        def following(limit=25, offset=0, filter=[])
+        def following(offset=0, limit=25, filter=[])
             uri = "/feed/#{@feed_url}/follows/"
             params = {
                 'limit' => limit,

data/lib/stream/version.rb

@@ -1,3 +1,3 @@
 module Stream
-  VERSION = "0.8.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stream-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tommaso Barbugli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty