traktr 0.3.0 → 0.4.0

data/spec/show_season_spec.rb

@@ -3,74 +3,50 @@ require 'spec_helper'
 describe Traktr::Show::Season do
   context 'POST methods' do
     before :all do
-      Traktr.api_key  = API_KEY
-      @show = Traktr::Show.summary('dexter')
+      trakt = Traktr::Client.new(API_KEY)
+      @show = trakt.show.summary('dexter')
       @season = 1
-      Traktr.api_key  = ''
-    end
-
-    after :all do
-      @show = nil
-      @season = nil
     end
 
     context 'with valid api_key and auth credentials' do
       before :all do
-        Traktr.api_key  = API_KEY
-        Traktr.username = USERNAME
-        Traktr.password = PASSWORD
-      end
-
-      after :all do
-        Traktr.api_key  = ''
-        Traktr.username = ''
-        Traktr.password = ''
+        @trakt = Traktr::Client.new(API_KEY, USERNAME, PASSWORD)
       end
 
       it '#library' do
-        expect(Traktr::Show::Season.library(@show, @season).status).to eql('success')
+        expect( @trakt.show.season.library(@show, @season).status ).to eql('success')
       end
 
       it '#seen' do
-        expect(Traktr::Show::Season.seen(@show, @season).status).to eql('success')
+        expect( @trakt.show.season.seen(@show, @season).status ).to eql('success')
       end
     end
 
     context 'without valid api_key' do
       before :all do
-        Traktr.username = USERNAME
-        Traktr.password = PASSWORD
-      end
-
-      after :all do
-        Traktr.username = ''
-        Traktr.password = ''
+        @trakt = Traktr::Client.new(nil)
       end
 
       it '#library' do
-        expect { comments = Traktr::Show::Season.library(@show, @season) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.season.library(@show, @season) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#seen' do
-        expect { summary = Traktr::Show::Season.seen(@show, @season) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.season.seen(@show, @season) }.to raise_error(Traktr::ResponseError)
       end
     end
 
     context 'without valid auth credentials' do
       before :all do
-        Traktr.api_key = API_KEY
-      end
-
-      after :all do
-        Traktr.api_key = ''
+        @trakt = Traktr::Client.new(API_KEY)
       end
 
       it '#library' do
-        expect { comments = Traktr::Show::Season.library(@show, @season) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.season.library(@show, @season) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#seen' do
-        expect { summary = Traktr::Show::Season.seen(@show, @season) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.season.seen(@show, @season) }.to raise_error(Traktr::ResponseError)
       end
     end
   end

data/spec/show_spec.rb

@@ -4,217 +4,188 @@ describe Traktr::Show do
   context 'GET methods' do
     context 'with valid api_key' do
       before :all do
-        Traktr.api_key = API_KEY
-      end
-
-      after :all do
-        Traktr.api_key = ''
+        @trakt = Traktr::Client.new(API_KEY)
       end
 
       context 'with valid query' do
         it '#comments' do
-          comments = Traktr::Show.comments('dexter')
-          expect(comments.size).to be > 0
+          expect( @trakt.show.comments('dexter').size ).to be > 0
         end
 
         it '#season' do
-          season = Traktr::Show.season('dexter', 1)
-          expect(season.size).to eql(12)
+          expect( @trakt.show.season('dexter', 1).size ).to eql(12)
         end
 
         it '#seasons' do
-          seasons = Traktr::Show.seasons('dexter')
-          expect(seasons.size).to eql(9)
+          expect( @trakt.show.seasons('dexter').size ).to eql(9)
         end
 
         it '#summary' do
-          summary = Traktr::Show.summary('dexter')
-          expect(summary.imdb_id).to eql('tt0773262')
+          expect( @trakt.show.summary('dexter').imdb_id ).to eql('tt0773262')
         end
 
         it '#summaries' do
-          summaries = Traktr::Show.summaries(['dexter', 'the-walking-dead'])
-          expect(summaries.size).to eql(2)
+          expect( @trakt.show.summaries(['dexter', 'the-walking-dead']).size ).to eql(2)
         end
 
         it '#watchingnow' do
-          watchingnow = Traktr::Show.watchingnow('dexter')
-          expect(watchingnow.size).to be >= 0
+          expect( @trakt.show.watchingnow('dexter').size ).to be >= 0
         end
 
         it '#related' do
-          related = Traktr::Show.related('dexter')
-          expect(related.size).to eql(10)
+          expect( @trakt.show.related('dexter').size ).to eql(10)
         end
       end
 
       context 'with invalid query' do
         it '#comments' do
-          expect { comments = Traktr::Show.comments('blah') }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.comments('blah') }.to raise_error(Traktr::ResponseError)
         end
 
         it '#season' do
-          expect { season = Traktr::Show.season('blah', 1) }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.season('blah', 1) }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.season('dexter') }.to raise_error(ArgumentError)
         end
 
         it '#seasons' do
-          expect { seasons = Traktr::Show.seasons('blah') }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.seasons('blah') }.to raise_error(Traktr::ResponseError)
         end
 
         it '#summary' do
-          expect { summary = Traktr::Show.summary('blah') }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.summary('blah') }.to raise_error(Traktr::ResponseError)
         end
 
         it '#summaries' do
-          expect { summaries = Traktr::Show.summaries(['blah', 'blah-blah']) }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.summaries(['blah', 'blah-blah']) }.to raise_error(Traktr::ResponseError)
         end
 
         it '#watchingnow' do
-          expect { watchingnow = Traktr::Show.watchingnow('blah') }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.watchingnow('blah') }.to raise_error(Traktr::ResponseError)
         end
 
         it '#related' do
-          expect { related = Traktr::Show.related('blah') }.to raise_error(Traktr::ResponseError)
+          expect { @trakt.show.related('blah') }.to raise_error(Traktr::ResponseError)
         end
       end
 
     end
 
     context 'without valid api_key' do
+      before :all do
+        @trakt = Traktr::Client.new(nil)
+      end
+
       it '#comments' do
-        expect { comments = Traktr::Show.comments('the-walking-dead') }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.comments('the-walking-dead') }.to raise_error(Traktr::ResponseError)
       end
 
       it '#season' do
-        expect { season = Traktr::Show.season('the-walking-dead', 1) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.season('the-walking-dead', 1) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#seasons' do
-        expect { seasons = Traktr::Show.seasons('the-walking-dead') }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.seasons('the-walking-dead') }.to raise_error(Traktr::ResponseError)
       end
 
       it '#summary' do
-        expect { summary = Traktr::Show.summary('the-walking-dead') }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.summary('the-walking-dead') }.to raise_error(Traktr::ResponseError)
       end
 
       it '#summaries' do
-        expect { summaries = Traktr::Show.summaries(['the-walking-dead', 'dexter']) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.summaries(['the-walking-dead', 'dexter']) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#watchingnow' do
-        expect { watchingnow = Traktr::Show.watchingnow('the-walking-dead') }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.watchingnow('the-walking-dead') }.to raise_error(Traktr::ResponseError)
       end
 
       it '#related' do
-        expect { related = Traktr::Show.related('the-walking-dead') }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.related('the-walking-dead') }.to raise_error(Traktr::ResponseError)
       end
     end
   end
 
   context 'POST methods' do
     before :all do
-      Traktr.api_key = API_KEY
-      @show = Traktr::Show.summary('dexter')
-      Traktr.api_key = ''
-    end
-
-    after :all do
-      @show = nil
+      trakt = Traktr::Client.new(API_KEY)
+      @show = trakt.show.summary('dexter')
     end
 
     context 'with valid api_key and auth credentials' do
       before :all do
-        Traktr.api_key  = API_KEY
-        Traktr.username = USERNAME
-        Traktr.password = PASSWORD
-      end
-
-      after :all do
-        Traktr.api_key  = ''
-        Traktr.username = ''
-        Traktr.password = ''
+        @trakt = Traktr::Client.new(API_KEY, USERNAME, PASSWORD)
       end
 
       it '#library' do
-        expect(Traktr::Show.library(@show).status).to eql('success')
+        expect( @trakt.show.library(@show).status ).to eql('success')
       end
 
       it '#unlibrary' do
-        expect(Traktr::Show.unlibrary(@show).status).to eql('success')
+        expect( @trakt.show.unlibrary(@show).status ).to eql('success')
       end
 
       it '#watchlist' do
-        expect(Traktr::Show.watchlist(@show).status).to eql('success')
+        expect( @trakt.show.watchlist(@show).status ).to eql('success')
       end
 
       it '#unwatchlist' do
-        expect(Traktr::Show.unwatchlist(@show).status).to eql('success')
+        expect( @trakt.show.unwatchlist(@show).status ).to eql('success')
       end
 
       it '#seen' do
-        expect(Traktr::Show.seen(@show).status).to eql('success')
+        expect( @trakt.show.seen(@show).status ).to eql('success')
       end
     end
 
     context 'without valid api_key' do
       before :all do
-        Traktr.username = USERNAME
-        Traktr.password = PASSWORD
-      end
-
-      after :all do
-        Traktr.username = ''
-        Traktr.password = ''
+        @trakt = Traktr::Client.new(nil, USERNAME, PASSWORD)
       end
 
       it '#library' do
-        expect { comments = Traktr::Show.library(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.library(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#unlibrary' do
-        expect { season = Traktr::Show.unlibrary(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.unlibrary(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#watchlist' do
-        expect { seasons = Traktr::Show.watchlist(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.watchlist(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#unwatchlist' do
-        expect { seasons = Traktr::Show.unwatchlist(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.unwatchlist(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#seen' do
-        expect { summary = Traktr::Show.seen(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.seen(@show) }.to raise_error(Traktr::ResponseError)
       end
     end
 
     context 'without valid auth credentials' do
       before :all do
-        Traktr.api_key = API_KEY
-      end
-
-      after :all do
-        Traktr.api_key = ''
+        @trakt = Traktr::Client.new(API_KEY)
       end
 
       it '#library' do
-        expect { comments = Traktr::Show.library(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.library(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#unlibrary' do
-        expect { season = Traktr::Show.unlibrary(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.unlibrary(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#watchlist' do
-        expect { seasons = Traktr::Show.watchlist(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.watchlist(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#unwatchlist' do
-        expect { seasons = Traktr::Show.unwatchlist(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.unwatchlist(@show) }.to raise_error(Traktr::ResponseError)
       end
 
       it '#seen' do
-        expect { summary = Traktr::Show.seen(@show) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.show.seen(@show) }.to raise_error(Traktr::ResponseError)
       end
     end
   end

data/spec/shows_spec.rb

@@ -4,31 +4,29 @@ describe Traktr::Shows do
   context 'GET methods' do
     context 'with valid api_key' do
       before :all do
-        Traktr.api_key = API_KEY
-      end
-
-      after :all do
-        Traktr.api_key = ''
+        @trakt = Traktr::Client.new(API_KEY)
       end
 
       it '#trending' do
-        shows = Traktr::Shows.trending
-        expect(shows.size).to be > 0
+        expect( @trakt.shows.trending.size ).to be > 0
       end
 
       it '#updated' do
-        shows = Traktr::Shows.updated(Time.now - 3600 * 24)
-        expect(shows.size).to be > 0
+        expect( @trakt.shows.updated(Time.now - 3600 * 24).size ).to be > 0
       end
     end
 
     context 'without valid api_key' do
+      before :all do
+        @trakt = Traktr::Client.new(nil)
+      end
+
       it '#trending' do
-        expect { Traktr::Shows.trending }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.shows.trending }.to raise_error(Traktr::ResponseError)
       end
 
       it '#updated' do
-        expect { Traktr::Shows.updated(Time.now - 3600 * 24) }.to raise_error(Traktr::ResponseError)
+        expect { @trakt.shows.updated(Time.now - 3600 * 24) }.to raise_error(Traktr::ResponseError)
       end
     end
   end

data/traktr.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Traktr::VERSION
   spec.authors       = ["Joe Lanford"]
   spec.email         = ["joe.lanford@gmail.com"]
-  spec.description   = %q{Implementation of the track.tv REST API.  See the documentation at http://trakt.tv/api-docs}
-  spec.summary       = %q{Implementation of the track.tv REST API}
+  spec.description   = %q{Implementation of the trakt.tv REST API.  See the documentation at http://trakt.tv/api-docs}
+  spec.summary       = %q{Implementation of the trakt.tv REST API}
   spec.homepage      = "https://github.com/joelanford/traktr"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traktr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Joe Lanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,7 +94,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Implementation of the track.tv REST API.  See the documentation at http://trakt.tv/api-docs
+description: Implementation of the trakt.tv REST API.  See the documentation at http://trakt.tv/api-docs
 email:
 - joe.lanford@gmail.com
 executables: []
@@ -109,7 +109,7 @@ files:
 - Rakefile
 - lib/traktr.rb
 - lib/traktr/account.rb
-- lib/traktr/authentication.rb
+- lib/traktr/client.rb
 - lib/traktr/movie.rb
 - lib/traktr/movies.rb
 - lib/traktr/search.rb
@@ -160,7 +160,7 @@ rubyforge_project:
 rubygems_version: 2.1.1
 signing_key: 
 specification_version: 4
-summary: Implementation of the track.tv REST API
+summary: Implementation of the trakt.tv REST API
 test_files:
 - spec/account_spec.rb
 - spec/movie_spec.rb
@@ -171,3 +171,4 @@ test_files:
 - spec/show_spec.rb
 - spec/shows_spec.rb
 - spec/spec_helper.rb
+has_rdoc: