trakt_api 0.0.2 → 0.0.3

data/lib/trakt_api/version.rb

@@ -1,3 +1,3 @@
 module TraktApi
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/trakt_api/activity_spec.rb

@@ -5,12 +5,6 @@ describe TraktApi::Activity do
   let(:mock_model) { SampleModel.new }
 
   describe '.community' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.community
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/community').and_return(mock_model)
@@ -18,26 +12,20 @@ describe TraktApi::Activity do
       model.community
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.community
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.community
     end
   end
 
   describe '.episodes' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.episodes(title: 'test', season: 1, episode: 2)
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/episodes').and_return(mock_model)
@@ -45,14 +33,14 @@ describe TraktApi::Activity do
       model.episodes(title: 'test', season: 1, episode: 2)
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.episodes(title: 'test', season: 1, episode: 2)
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.episodes(title: 'test', season: 1, episode: 2)
     end
@@ -77,15 +65,15 @@ describe TraktApi::Activity do
 
       model.friends
     end
-  end
 
-  describe '.movies' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
-      model.movies(title: 'test')
+      model.friends
     end
+  end
 
+  describe '.movies' do
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/movies').and_return(mock_model)
@@ -93,26 +81,20 @@ describe TraktApi::Activity do
       model.movies(title: 'test')
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.movies(title: 'test')
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.movies(title: 'test')
     end
   end
 
   describe '.seasons' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.seasons(title: 'test', season: 1)
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/seasons').and_return(mock_model)
@@ -120,26 +102,20 @@ describe TraktApi::Activity do
       model.seasons(title: 'test', season: 1)
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.seasons(title: 'test', season: 1)
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.seasons(title: 'test', season: 1)
     end
   end
 
   describe '.shows' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.shows(title: 'test')
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/shows').and_return(mock_model)
@@ -147,26 +123,20 @@ describe TraktApi::Activity do
       model.shows(title: 'test')
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.shows(title: 'test')
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.shows(title: 'test')
     end
   end
 
   describe '.user' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.user(username: 'test')
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/user').and_return(mock_model)
@@ -174,26 +144,20 @@ describe TraktApi::Activity do
       model.user(username: 'test')
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.user(username: 'test')
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.user(username: 'test')
     end
   end
 
   describe '.user_episodes' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.user_episodes(username: 'justin', title: 'test', season: 1, episode: 2)
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/user/episodes').and_return(mock_model)
@@ -201,26 +165,20 @@ describe TraktApi::Activity do
       model.user_episodes(username: 'justin', title: 'test', season: 1, episode: 2)
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.user_episodes(username: 'justin', title: 'test', season: 1, episode: 2)
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.user_episodes(username: 'justin', title: 'test', season: 1, episode: 2)
     end
   end
 
   describe '.user_movies' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.user_movies(username: 'justin', title: 'test')
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/user/movies').and_return(mock_model)
@@ -228,26 +186,20 @@ describe TraktApi::Activity do
       model.user_movies(username: 'justin', title: 'test')
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.user_movies(username: 'justin', title: 'test')
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.user_movies(username: 'justin', title: 'test')
     end
   end
 
   describe '.user_seasons' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.user_seasons(username: 'justin', title: 'test', season: 1)
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/user/seasons').and_return(mock_model)
@@ -255,26 +207,20 @@ describe TraktApi::Activity do
       model.user_seasons(username: 'justin', title: 'test', season: 1)
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.user_seasons(username: 'justin', title: 'test', season: 1)
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.user_seasons(username: 'justin', title: 'test', season: 1)
     end
   end
 
   describe '.user_shows' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
-
-      model.user_shows(username: 'justin', title: 'test')
-    end
-
     it 'should call get with specific params' do
       model.instance_variable_set("@method", :get)
       model.should_receive(:get).with('activity/user/shows').and_return(mock_model)
@@ -282,14 +228,14 @@ describe TraktApi::Activity do
       model.user_shows(username: 'justin', title: 'test')
     end
 
-    it 'should call restful_params' do
-      model.should_receive(:restful_params).and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.user_shows(username: 'justin', title: 'test')
     end
 
-    it 'should call params' do
-      model.should_receive(:params).and_return(mock_model)
+    it 'should call restful_params' do
+      model.should_receive(:restful_params).and_return(mock_model)
 
       model.user_shows(username: 'justin', title: 'test')
     end

data/spec/trakt_api/base_spec.rb

@@ -15,14 +15,6 @@ describe TraktApi::Base do
     end
   end
 
-  describe '.optionl_auth' do
-    it 'should call auth' do
-      model.should_receive(:auth)
-
-      model.optional_auth(auth: true)
-    end
-  end
-
   describe '.store_uri' do
     it 'should set uri' do
       model.stub(:api_key).and_return('API_KEY')
@@ -70,7 +62,7 @@ describe TraktApi::Base do
 
   describe '.params' do
     it 'should set @params' do
-      model.params(sample: true)
+      model.params(sample: true, auth: true)
 
       model.instance_variable_get('@params').should == { sample: true }
     end
@@ -79,10 +71,11 @@ describe TraktApi::Base do
   describe '.restful_params' do
     it 'should return correct uri' do
       model.instance_variable_set('@uri', 'URI')
+      model.instance_variable_set('@params', { sample: 'test' })
 
-      model.restful_params({}, [])
+      model.restful_params([:sample])
 
-      model.instance_variable_get('@uri').should == 'URI/'
+      model.instance_variable_get('@uri').should == 'URI/test'
     end
   end
 

data/spec/trakt_api/calendar_spec.rb

@@ -5,15 +5,15 @@ describe TraktApi::Calendar do
   let(:mock_model) { SampleModel.new }
 
   describe '.settings' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call get with specific params' do
+      model.instance_variable_set("@method", :get)
+      model.should_receive(:get).with('calendar/premieres').and_return(mock_model)
 
       model.premieres(date: '20130101')
     end
 
-    it 'should call get with specific params' do
-      model.instance_variable_set("@method", :get)
-      model.should_receive(:get).with('calendar/premieres').and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.premieres(date: '20130101')
     end
@@ -26,15 +26,15 @@ describe TraktApi::Calendar do
   end
 
   describe '.shows' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call get with specific params' do
+      model.instance_variable_set("@method", :get)
+      model.should_receive(:get).with('calendar/shows').and_return(mock_model)
 
       model.shows(date: '20130101')
     end
 
-    it 'should call get with specific params' do
-      model.instance_variable_set("@method", :get)
-      model.should_receive(:get).with('calendar/shows').and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.shows(date: '20130101')
     end
@@ -42,7 +42,7 @@ describe TraktApi::Calendar do
     it 'should call restful_params' do
       model.should_receive(:restful_params).and_return(mock_model)
 
-      model.shows(date: '20130101')
+      model.premieres(date: '20130101')
     end
   end
 end

data/spec/trakt_api/movie_spec.rb

@@ -4,18 +4,18 @@ describe TraktApi::Movie do
   let(:model) { TraktApi::Movie.new(TraktApi::Client.new) }
   let(:mock_model) { SampleModel.new }
 
-  describe '.cancel_checkin' do
+  describe '.cancel_check_in' do
     it 'should call auth' do
       model.should_receive(:auth).and_return(mock_model)
 
-      model.cancel_checkin
+      model.cancel_check_in
     end
 
     it 'should call post with specific params' do
       model.instance_variable_set("@method", :post)
       model.should_receive(:post).with('movie/cancelcheckin').and_return(mock_model)
 
-      model.cancel_checkin
+      model.cancel_check_in
     end
   end
 
@@ -34,24 +34,24 @@ describe TraktApi::Movie do
     end
   end
 
-  describe '.checkin' do
+  describe '.check_in' do
     it 'should call auth' do
       model.should_receive(:auth).and_return(mock_model)
 
-      model.checkin(sample: true)
+      model.check_in(sample: true)
     end
 
     it 'should call post with specific params' do
       model.instance_variable_set("@method", :post)
       model.should_receive(:post).with('movie/checkin').and_return(mock_model)
 
-      model.checkin(sample: true)
+      model.check_in(sample: true)
     end
 
     it 'should call params' do
       model.should_receive(:params).and_return(mock_model)
 
-      model.checkin(sample: true)
+      model.check_in(sample: true)
     end
   end
 
@@ -134,15 +134,15 @@ describe TraktApi::Movie do
   end
 
   describe '.related' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call get with specific params' do
+      model.instance_variable_set("@method", :get)
+      model.should_receive(:get).with('movie/related').and_return(mock_model)
 
       model.related(title: 'TITLE', hidewatched: 'HIDEWATCH')
     end
 
-    it 'should call get with specific params' do
-      model.instance_variable_set("@method", :get)
-      model.should_receive(:get).with('movie/related').and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.related(title: 'TITLE', hidewatched: 'HIDEWATCH')
     end
@@ -162,6 +162,12 @@ describe TraktApi::Movie do
       model.stats(title: 'TITLE')
     end
 
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
+
+      model.stats(title: 'TITLE')
+    end
+
     it 'should call restful_params' do
       model.should_receive(:restful_params).and_return(mock_model)
 
@@ -170,15 +176,15 @@ describe TraktApi::Movie do
   end
 
   describe '.summary' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call get with specific params' do
+      model.instance_variable_set("@method", :get)
+      model.should_receive(:get).with('movie/summary').and_return(mock_model)
 
       model.summary(title: 'TITLE')
     end
 
-    it 'should call get with specific params' do
-      model.instance_variable_set("@method", :get)
-      model.should_receive(:get).with('movie/summary').and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.summary(title: 'TITLE')
     end
@@ -198,6 +204,12 @@ describe TraktApi::Movie do
       model.summaries(title: 'TITLE', extended: 'EXTENDED')
     end
 
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
+
+      model.summaries(title: 'TITLE', extended: 'EXTENDED')
+    end
+
     it 'should call restful_params' do
       model.should_receive(:restful_params).and_return(mock_model)
 
@@ -290,15 +302,15 @@ describe TraktApi::Movie do
   end
 
   describe '.watching_now' do
-    it 'should call optional_auth' do
-      model.should_receive(:optional_auth).and_return(mock_model)
+    it 'should call get with specific params' do
+      model.instance_variable_set("@method", :get)
+      model.should_receive(:get).with('movie/watchingnow').and_return(mock_model)
 
       model.watching_now(title: 'TITLE')
     end
 
-    it 'should call get with specific params' do
-      model.instance_variable_set("@method", :get)
-      model.should_receive(:get).with('movie/watchingnow').and_return(mock_model)
+    it 'should call params' do
+      model.should_receive(:params).and_return(mock_model)
 
       model.watching_now(title: 'TITLE')
     end