viki 1.0.1 → 1.0.2

data/lib/viki/api_object.rb

@@ -30,6 +30,14 @@ module Viki
       @previous_url ? direct_request(@previous_url) : nil
     end
 
+    def next?
+      !@next_url.nil?
+    end
+
+    def prev?
+      !@previous_url.nil?
+    end
+
     private
 
     def direct_request(url)

data/lib/viki/request.rb

@@ -14,7 +14,6 @@ module Viki
 
     def get
       current_chain = @call_chain
-      @call_chain = []
       request(current_chain)
     end
 
@@ -27,9 +26,9 @@ module Viki
       params.delete(:access_token)
 
       url_params = ""
-      params.keys.each { |key| url_params += "#{key}=#{params[key]}" }
+      params.keys.each { |key| url_params += "#{key}=#{params[key]}&" }
 
-      "#{path.chop}?#{url_params}"
+      "#{path.chop}?#{url_params.chop}"
     end
 
     private

data/lib/viki/version.rb

@@ -1,3 +1,3 @@
 module Viki
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/lib/request_spec.rb

@@ -23,6 +23,13 @@ describe Viki::Request do
       req.get
     end
 
+    it "should not clear the call_chain after .get is called" do
+      req = client.movies(1234, { genre: 2 })
+      req.should_receive(:request)
+      req.get
+      req.instance_variable_get(:@call_chain).should_not == []
+    end
+
     it "should raise NoMethodError error if part of the call chain is not part of the URL_NAMESPACES list" do
       expect { client.methodwrong.subtitles('en') }.to raise_error(NoMethodError)
     end
@@ -30,9 +37,8 @@ describe Viki::Request do
 
   describe "#url" do
     it "should return the right url for the method call" do
-      req = client.movies(1234, { genre: 2 })
-      req.url.should == "movies/1234?genre=2"
+      req = client.movies(1234, { genre: 2, per_page: 3 })
+      req.url.should == "movies/1234?genre=2&per_page=3"
     end
-
   end
 end

data/spec/requests/request_integration_spec.rb

@@ -141,7 +141,7 @@ describe "Viki" do
 
     describe ".next" do
       it "should invoke direct_request with a next_url" do
-        VCR.use_cassette("movies/list/pg2", :record => :new_episodes) do
+        VCR.use_cassette("movies/list/pg2") do
           movies = client.movies.get
           next_url = movies.instance_variable_get(:@next_url)
           movies.should_receive(:direct_request).with(next_url)
@@ -152,7 +152,7 @@ describe "Viki" do
 
     describe ".prev" do
       it "should invoke direct_request with previous_url" do
-        VCR.use_cassette("movies/list/pg2", :record => :new_episodes) do
+        VCR.use_cassette("movies/list/pg2") do
           movies_pg1 = client.movies.get
           movies_pg2 = movies_pg1.next
           previous_url = movies_pg2.instance_variable_get(:@previous_url)
@@ -162,6 +162,40 @@ describe "Viki" do
       end
     end
 
+    describe ".next?" do
+      it "should return true when url is available" do
+        VCR.use_cassette("movies/list/pg2") do
+          movies = client.movies.get
+          movies.next?.should == true
+        end
+      end
+
+      it "should return false when not next url not available" do
+        VCR.use_cassette("movies/list/pg2") do
+          response = client.movies.get
+          response.instance_variable_set(:@next_url, nil)
+          response.next?.should == false
+        end
+      end
+    end
+
+    describe ".prev?" do
+      it "should return false when not next url not available" do
+        VCR.use_cassette("movies/list/pg2") do
+          response = client.movies.get
+          response.instance_variable_set(:@previous_url, "www.google.com")
+          response.prev?.should == true
+        end
+      end
+
+      it "should return true when url is available" do
+        VCR.use_cassette("movies/list/pg2") do
+          movies = client.movies.get
+          movies.prev?.should == false
+        end
+      end
+    end
+
     describe "Errors" do
       it "should raise NoMethodError if a method that is not on the whitelist is called" do
         expect { client.does_not_exist }.should raise_error(NoMethodError)
@@ -172,8 +206,8 @@ describe "Viki" do
           lambda { client.movies(50).get }.should raise_error(Viki::Error, "The resource couldn't be found")
         end
 
-      results = client.movies.get
-      results.should be_instance_of(Viki::APIObject)
+        results = client.movies.get
+        results.should be_instance_of(Viki::APIObject)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viki
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec