redvine 0.0.5 → 0.0.6

data/README.md

@@ -25,16 +25,20 @@ It pretty much goes without saying that this wasn't authorized by Vine or anyone
 
     # Find videos by tag
     client.search('cats')
+    client.search('cats', :page => 2)
 
     # Find user profiles by user ID 
     client.user_profile('908082141764657152')
 
     # Get a user's timeline by their user ID
     client.user_timeline('908082141764657152')
+    client.user_timeline('908082141764657152', :page => 2)
 
     # Get popular and promoted videos
     client.popular
+    client.popular(:page => 2)
     client.promoted
+    client.promoted(:page => 2)
 
 ## Things To Do
 

data/lib/redvine.rb

@@ -8,7 +8,7 @@ class Redvine
 
   @@baseUrl = 'https://api.vineapp.com/'
   @@deviceToken = 'Redvine'
-  @@userAgent = 'com.vine.iphone/1.01 (unknown, iPhone OS 6.0, iPad, Scale/2.000000) (Redvine)'
+  @@userAgent = 'iphone/1.3.1 (iPhone; iOS 6.1.3; Scale/2.00) (Redvine)'
 
   def connect(opts={})
     validate_connect_args(opts)
@@ -20,31 +20,31 @@ class Redvine
     @user_id = response.parsed_response['data']['userId']
   end
 
-  def search(tag)
+  def search(tag, opts={})
     raise(ArgumentError, 'You must specify a tag') if !tag
-    get_request_data('timelines/tags/' + tag)
+    get_request_data('timelines/tags/' + tag, opts)
   end
 
-  def popular
-    get_request_data('timelines/popular')
+  def popular(opts={})
+    get_request_data('timelines/popular', opts)
   end
 
-  def promoted
-    get_request_data('timelines/promoted')
+  def promoted(opts={})
+    get_request_data('timelines/promoted', opts)
   end
 
-  def timeline
-    get_request_data('timelines/graph')
+  def timeline(opts={})
+    get_request_data('timelines/graph', opts)
   end
 
   def user_profile(uid)
     raise(ArgumentError, 'You must specify a user id') if !uid
-    get_request_data('users/profiles/' + uid, false)
+    get_request_data('users/profiles/' + uid, {}, false)
   end
 
-  def user_timeline(uid)
+  def user_timeline(uid, opts={})
     raise(ArgumentError, 'You must specify a user id') if !uid
-    get_request_data('timelines/users/' + uid)
+    get_request_data('timelines/users/' + uid, opts)
   end
 
 
@@ -56,11 +56,19 @@ class Redvine
   end
 
   def session_headers
-    {'User-Agent' => @@userAgent, 'vine-session-id' => @vine_key}
+    {
+      'User-Agent' => @@userAgent, 
+      'vine-session-id' => @vine_key,
+      'Accept' => '*/*', 
+      'Accept-Language' => 'en;q=1, fr;q=0.9, de;q=0.8, ja;q=0.7, nl;q=0.6, it;q=0.5'
+    }
   end
 
-  def get_request_data(endpoint, records=true)
-    response = HTTParty.get(@@baseUrl + endpoint, {headers: session_headers})
+  def get_request_data(endpoint, query={}, records=true)
+    query.merge!(:size => 20) if query.has_key?(:page) && !query.has_key?(:size)
+    args = {:headers => session_headers}
+    args.merge!(:query => query) if query != {}
+    response = HTTParty.get(@@baseUrl + endpoint, args)
     if response.parsed_response['success'] == false
       response.parsed_response['error'] = true
       return Hashie::Mash.new(response.parsed_response)

data/lib/redvine/version.rb

@@ -1,3 +1,3 @@
 class Redvine
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/redvine_spec.rb

@@ -54,6 +54,16 @@ describe Redvine do
       end
     end
 
+    it 'should return a second page of results' do
+      VCR.use_cassette('redvine', :record => :new_episodes) do
+        client = setup_client()
+        vines = client.search('cat')
+        vinesp2 = client.search('cat', :page => 2)
+        expect(vines).to_not equal(vinesp2)
+        expect(vines.first.videoUrl).to_not equal(vinesp2.first.videoUrl)
+      end
+    end
+
   end
 
   describe '.popular' do
@@ -71,6 +81,16 @@ describe Redvine do
       end
     end
 
+    it 'should return a second page of results' do
+      VCR.use_cassette('redvine', :record => :new_episodes) do
+        client = setup_client()
+        vines = client.popular
+        vinesp2 = client.popular(:page => 2)
+        expect(vines).to_not equal(vinesp2)
+        expect(vines.first.videoUrl).to_not equal(vinesp2.first.videoUrl)
+      end
+    end
+
   end
 
 
@@ -89,6 +109,16 @@ describe Redvine do
       end
     end
 
+    it 'should return a second page of results' do
+      VCR.use_cassette('redvine', :record => :new_episodes) do
+        client = setup_client()
+        vines = client.promoted
+        vinesp2 = client.promoted(:page => 2)
+        expect(vines).to_not equal(vinesp2)
+        expect(vines.first.videoUrl).to_not equal(vinesp2.first.videoUrl)
+      end
+    end
+
   end
 
   describe '.timeline' do
@@ -106,6 +136,16 @@ describe Redvine do
       end
     end
 
+    it 'should return a second page of results' do
+      VCR.use_cassette('redvine', :record => :new_episodes) do
+        client = setup_client()
+        vines = client.timeline()
+        vinesp2 = client.timeline(:page => 2)
+        expect(vines).to_not equal(vinesp2)
+        expect(vines.first.videoUrl).to_not equal(vinesp2.first.videoUrl)
+      end
+    end
+
   end
 
   describe '.user_profile' do
@@ -161,6 +201,16 @@ describe Redvine do
       end
     end
 
+    it 'should return a second page of results' do
+      VCR.use_cassette('redvine', :record => :new_episodes) do
+        client = setup_client()
+        vines = client.user_timeline('914021455983943680')
+        vinesp2 = client.user_timeline('914021455983943680', :page => 2)
+        expect(vines).to_not equal(vinesp2)
+        expect(vines.first.videoUrl).to_not equal(vinesp2.first.videoUrl)
+      end
+    end
+
     it 'should not break if an error is returned from Vine' do
       VCR.use_cassette('redvine', :record => :new_episodes) do
         client = setup_client()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redvine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty