trakt_api 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f02f863053f9b797654121ba6cd8d24e5e4c9b3
-  data.tar.gz: f85005692b1ee864416f4e5413cf2a457796e040
+  metadata.gz: 57fc329e9fdc3c30dce19c946a54748086a0f144
+  data.tar.gz: 36cb6efb77dec44d517bff3bd2ea7036d19b64af
 SHA512:
-  metadata.gz: 5abbbedea5d3b6472eb31401fb6278ecf6e7182753abcf2294016d1e517ea19f412990a0c57358254af46c4ed247af70bf367f84b7d527e19defc5d225adccf8
-  data.tar.gz: a21c16ce803175971c0d4afa4a6b1603f9d889a410d60d5d2efba73d34d0f452b483b33eb6e3b66395cba3cb8bbcad092a8d5819c82b7a10e4245a69feb5fcfe
+  metadata.gz: a3f9bd0db3afc61e0a8e99b8ad4afd9cc72e3231cf290d957d460694098b11343039e12aa84f4ecaba85954f75661f0264718c302d7bea36be550a73ff214d40
+  data.tar.gz: ace82e63abf2a571a64d208a52455d10bd0ca7c4aed25277dd49f8378c41a828f9bfc6f4325c4235f06d9dd8a21dfeee90fad708dc681aeb23b1d4df5356bfcd

data/.gitignore

@@ -16,4 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 
-spec/integrations/support/trakt_api.rb
+spec/support/trakt_api.rb

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
-script: 'bundle exec rspec spec/trakt_api'
+script: 'bundle exec rspec spec/functionals'
 rvm:
+  - 1.9.3
   - 2.0.0
+  - 2.1.0

data/README.md

@@ -1,247 +1,59 @@
-[![Build Status](https://travis-ci.org/wafcio/trakt_api.png?branch=master)](https://travis-ci.org/wafcio/trakt_api)
-[![Dependency Status](https://gemnasium.com/wafcio/trakt_api.png)](https://gemnasium.com/wafcio/trakt_api)
-[![Code Climate](https://codeclimate.com/github/wafcio/trakt_api.png)](https://codeclimate.com/github/wafcio/trakt_api)
-[![Coverage Status](https://coveralls.io/repos/wafcio/trakt_api/badge.png)](https://coveralls.io/r/wafcio/trakt_api)
+[![Build Status](https://travis-ci.org/tvapi/trakt_api.png?branch=master)](https://travis-ci.org/tvapi/trakt_api)
+[![Dependency Status](https://gemnasium.com/tvapi/trakt_api.png)](https://gemnasium.com/tvapi/trakt_api)
+[![Code Climate](https://codeclimate.com/github/tvapi/trakt_api.png)](https://codeclimate.com/github/tvapi/trakt_api)
+[![Coverage Status](https://coveralls.io/repos/tvapi/trakt_api/badge.png)](https://coveralls.io/r/tvapi/trakt_api)
 [![Gem Version](https://badge.fury.io/rb/trakt_api.png)](http://badge.fury.io/rb/trakt_api)
 
 # TraktApi
 
 trakt_api is a simple ruby client for trakt.tv API.
 
-## Getting started
+## Installation
 
-You can add it to your Gemfile with:
+With Bundler:
 
 ```ruby
 gem 'trakt_api'
 ```
 
-Run the bundle command to install it.
-
-After you install ThetvdbApi and add it to your Gemfile, you need to run the generator (if you use Ruby on Rails application):
-
-```console
-rails generate trakt_api:install
-```
-
-The generator will install an initializer where you must past your api_key, username and password (not sha1).
-
-## How to use
-
-There is one entry point, in initialize you can past hash with api_key, username and password (not sha1) values, or leave empty:
-
-```ruby
-client = TrakApi::Client.new(api_key: '...', username: '...', password: '...')
-```
-
-## Usage
-
-For Authentication this gem use Basic Authentication, so you don't need pass username and password in each api call. If you want active authentication (if authentication is optional) in api call you must pass
-```ruby
-{ auth: true }
-```
-in options
-
-Full documentation is available here: [http://trakt.tv/api-docs](http://trakt.tv/api-docs)
-
-
-Account API
-
-```ruby
-client.account.create({...})
-client.account.settings
-client.account.test
-```
-
-Activity API
-
-```ruby
-client.activity.community({...})
-client.activity.episodes({...})
-client.activity.friends({...})
-client.activity.movies({...})
-client.activity.seasons({...})
-client.activity.shows({...})
-client.activity.user({...})
-client.activity.user_episodes({...})
-client.activity.user_movies({...})
-client.activity.user_seasons({...})
-client.activity.user_shows({...})
-```
-
-Calendar API
-
-```ruby
-client.calendar.premieres({...})
-client.calendar.shows({...})
-```
-
-Comment API
-
 ```ruby
-client.comment.episode({...})
-client.comment.movie({...})
-client.comment.show({...})
+$ bundle install
 ```
 
-Genres API
+Otherwhise:
 
 ```ruby
-client.genres.movies({...})
-client.genres.shows({...})
+gem install trakt_api
 ```
+## How to use
 
-Lists API
+You have two way for access to api:
 
-```ruby
-client.lists.add({...})
-client.lists.delete({...})
-client.lists.items_add({...})
-client.lists.items_delete({...})
-client.lists.update({...})
-```
+* I case (create client class, one entry point)
 
-Movie API
+Language attribute is optional with default value 'en'
 
 ```ruby
-client.movie.cancel_check_in
-client.movie.cancel_watching
-client.movie.check_in({...})
-client.movie.comments({...})
-client.movie.scrobble({...})
-client.movie.library({...})
-client.movie.related({...})
-client.movie.stats({...})
-client.movie.summary({...})
-client.movie.summaries({...})
-client.movie.unseen({...})
-client.movie.unwatch_list({...})
-client.movie.watching({...})
-client.movie.watching_now({...})
-client.movie.watch_list({...})
+client = TraktApi::Client.new(api_key: '...')
+client.search({..})
 ```
 
-Movies API
+* II case (direct access to api class, many entry points)
 
-```ruby
-client.movies.trending({...})
-client.movies.updated({...})
-```
-
-Network API
+Language attribute is required
 
 ```ruby
-client.network.approve({...})
-client.network.deny({...})
-client.network.follow({...})
-client.network.requests
-client.network.unfollow({...})
+ThetvdbApi::Search.new(api_key: '...').call({...})
 ```
 
-Rate API
-
-```ruby
-client.rate.episode({...})
-client.rate.episodes({...})
-client.rate.movie({...})
-client.rate.movies({...})
-client.rate.show({...})
-client.rate.shows({...})
-```
+## Usage
 
-Recommendations API
-
-```ruby
-client.recommendations.movies({...})
-client.recommendations.movies_dismiss({...})
-client.recommendations.shows({...})
-client.recommendations.shows_dismiss({...})
-```
+Full documentation is available here: [http://docs.trakt.apiary.io](http://docs.trakt.apiary.io)
 
 Search API
 
 ```ruby
-client.search.episodes({...})
-client.search.movies({...})
-client.search.people({...})
-client.search.shows({...})
-client.search.users({...})
-```
-
-Server API
-
-```ruby
-client.server.time
-```
-
-Show API
-
-```ruby
- client.show.cancel_check_in
- client.show.cancel_watching
- client.show.check_in({...})
- client.show.comments({...})
- client.show.episode_comments({...})
- client.show.episode_library({...})
- client.show.episode_seen({...})
- client.show.episode_stats({...})
- client.show.episode_summary({...})
- client.show.episode_unlibrary({...})
- client.show.episode_unseen({...})
- client.show.episode_unwatch_list({...})
- client.show.episode_watching_now({...})
- client.show.episode_watch_list({...})
- client.show.library({...})
- client.show.related({...})
- client.show.scrobble({...})
- client.show.season({...})
- client.show.season_library({...})
- client.show.season_seen({...})
- client.show.seasons({...})
- client.show.seen({...})
- client.show.stats({...})
- client.show.summary({...})
- client.show.summaries({...})
- client.show.unlibrary({...})
- client.show.unwatch_list({...})
- client.show.watching({...})
- client.show.watching_now({...})
- client.show.watch_list({...})
-```
-
-Shows API
-
-```ruby
-client.shows.trending({...})
-client.shows.updated({...})
-```
-
-User API
-
-```ruby
-client.user.calendar_shows({...})
-client.user.last_activity({...})
-client.user.library_movies_all({...})
-client.user.library_movies_collection({...})
-client.user.library_movies_watched({...})
-client.user.library_shows_all({...})
-client.user.library_shows_collection({...})
-client.user.library_shows_watched({...})
-client.user.list({...})
-client.user.lists({...})
-client.user.network_followers({...})
-client.user.network_following({...})
-client.user.network_friends({...})
-client.user.profile({...})
-client.user.progress_collected({...})
-client.user.progress_watched({...})
-client.user.ratings_episodes({...})
-client.user.ratings_movies({...})
-client.user.ratings_shows({...})
-client.user.watching({...})
-client.user.watch_list_episode({...})
-client.user.watch_list_movies({...})
-client.user.watch_list_shows({...})
+client.search({...})
 ```
 
 ## Contributing

data/lib/trakt_api.rb

@@ -1,22 +1,8 @@
+require 'ov'
+
 module TraktApi; end
 
 require 'trakt_api/version'
-require 'trakt_api/configuration'
 require 'trakt_api/base'
-require 'trakt_api/account'
-require 'trakt_api/activity'
-require 'trakt_api/calendar'
-require 'trakt_api/comment'
-require 'trakt_api/genres'
-require 'trakt_api/lists'
-require 'trakt_api/movie'
-require 'trakt_api/movies'
-require 'trakt_api/network'
-require 'trakt_api/rate'
-require 'trakt_api/recommendations'
-require 'trakt_api/search'
-require 'trakt_api/server'
-require 'trakt_api/show'
-require 'trakt_api/shows'
-require 'trakt_api/user'
 require 'trakt_api/client'
+require 'trakt_api/search'

data/lib/trakt_api/base.rb

@@ -1,89 +1,56 @@
-require 'httparty'
+require 'service_api'
 require 'string_to_sha1'
 
 class TraktApi::Base
-  include HTTParty
-  base_uri 'http://api.trakt.tv//'
+  include ServiceApi::BaseFaraday
 
-  def initialize(client)
-    @client = client
-
-    @auth = false
-    @params = {}
-  end
-
-  def auth
-    @auth = true
-
-    self
-  end
-
-  def store_uri(uri)
-    @uri = "#{uri}.json/#{api_key}"
-  end
-
-  def get(uri)
-    store_uri(uri)
-    @method = :get
-
-    self
-  end
-
-  def post(uri)
-    store_uri(uri)
-    @method = :post
-
-    self
+  %w[get post put delete].each do |method|
+    define_method method do
+      connection.headers = headers
+      connection.send(method, uri, query_params)
+    end
   end
 
   def params(options)
-    @params = options
-    auth if options.delete(:auth)
-
-    self
-  end
-
-  def restful_params(fields = [])
-    restful_params_string = ''
-    fields.each do |field|
-      value = @params.delete(field)
-      restful_params_string += "/#{value}" if value
-    end
-    @uri = "#{@uri}#{restful_params_string}"
-
-    self
-  end
+    @token = options.delete(:token)
 
-  def response
-    self.class.send(@method, @uri, request_options)
+    super
   end
 
-  def request_options
-    { body: @params }.merge(@auth ? auth_hash : {})
-  end
+  private
 
-  def auth_hash
-    {
-      basic_auth: {
-        username: username,
-        password: password.to_sha1
-      }
+  def headers
+    headers = {
+      'Content-Type' => 'application/json',
+      'trakt-api-key' => @config[:api_key],
+      'trakt-api-version' => '2'
     }
-  end
 
-  def series_uri(series_id)
-    "#{api_key}/series/#{series_id}/"
+    @token ? headers.merge('Authorization' => "Bearer #{@token}") : headers
   end
 
-  def api_key
-    @client.api_key
+  def connection
+    @connection ||= Faraday.new(url: base_url, ssl: { verify: false }) do |builder|
+      builder.request :json
+      builder.response :json, content_type: /\bjson$/
+
+      if @config[:adapter] == :test
+        builder.adapter @config[:adapter], @config[:adapter_options]
+      else
+        builder.adapter @config[:adapter] || :net_http
+      end
+    end
   end
 
-  def username
-    @client.username
+  def uri_kind
+    :colon
   end
 
-  def password
-    @client.password
+  def base_url
+    if @config[:sandbox]
+      'https://api.staging.trakt.tv'
+    else
+      'https://api.trakt.tv'
+    end
   end
 end

data/lib/trakt_api/client.rb

@@ -1,74 +1,13 @@
 class TraktApi::Client
-  attr_reader :api_key, :username, :password
+  attr_reader :config
 
-  def initialize(options = {})
-    [:api_key, :username, :password]. each do |key|
-      value = options[key] ? options[key] : TraktApi::Configuration.send(key)
-      instance_variable_set("@#{key}", value)
-    end
-  end
-
-  def account
-    @account ||= TraktApi::Account.new(self)
-  end
-
-  def activity
-    @activity ||= TraktApi::Activity.new(self)
-  end
-
-  def calendar
-    @calendar ||= TraktApi::Calendar.new(self)
-  end
-
-  def comment
-    @comment ||= TraktApi::Comment.new(self)
-  end
-
-  def genres
-    @genres ||= TraktApi::Genres.new(self)
-  end
-
-  def lists
-    @lists ||= TraktApi::Lists.new(self)
-  end
-
-  def movie
-    @movie ||= TraktApi::Movie.new(self)
-  end
-
-  def movies
-    @movies ||= TraktApi::Movies.new(self)
-  end
-
-  def network
-    @network ||= TraktApi::Network.new(self)
-  end
-
-  def rate
-    @rate ||= TraktApi::Rate.new(self)
-  end
-
-  def recommendations
-    @recommendations ||= TraktApi::Recommendations.new(self)
-  end
-
-  def search
-    @search ||= TraktApi::Search.new(self)
-  end
-
-  def server
-    @server ||= TraktApi::Server.new(self)
-  end
-
-  def show
-    @server ||= TraktApi::Show.new(self)
-  end
+  def initialize(config = {})
+    @config = config
 
-  def shows
-    @shows ||= TraktApi::Shows.new(self)
+    @config[:adapter] ||= :net_http
   end
 
-  def user
-    @user ||= TraktApi::User.new(self)
+  def search(options)
+    @search ||= TraktApi::Search.new(config).call(options)
   end
 end